summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
| |/
* | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-242-5/+38
* | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-242-53/+93
|/
* Run Black. (#5482)Amber Brown2019-06-2035-2765/+2187
* Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-191-9/+19
|\
| * Fix loglineErik Johnston2019-06-181-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi...Erik Johnston2019-06-1820-323/+1372
| |\
| * | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
* | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsErik Johnston2019-06-191-1/+74
|\ \ \
| * | | Run as background process and fix commentsErik Johnston2019-06-191-2/+5
| * | | Add experimental option to reduce extremities.Erik Johnston2019-06-181-1/+71
* | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-181-8/+38
| |_|/ |/| |
* | | Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-171-0/+10
* | | Add third party rules hook into create roomErik Johnston2019-06-171-1/+24
|/ /
* | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-172-16/+17
|\ \
| * | Handle HttpResponseException when using federation client.Erik Johnston2019-06-072-16/+17
* | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-171-6/+0
|\ \ \
| * | | Fix 3PID invite room state over federation.Erik Johnston2019-06-141-6/+0
* | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-142-4/+78
|\ \ \ \
| * | | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-142-4/+78
| |/ / /
* | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-142-0/+9
* | | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-141-0/+4
|/ / /
* / / Fix defaults on checking threepidsErik Johnston2019-06-101-0/+1
|/ /
* | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-062-14/+63
* | Fix missing logcontext for PresenceHandler.on_shutdown. (#5369)Richard van der Hoff2019-06-061-1/+7
* | Merge pull request #5089 from dnaf/m-heroes-empty-room-nameBrendan Abolivier2019-06-061-5/+4
|\ \
| * | Simplify conditionBrendan Abolivier2019-06-061-2/+2
| * | Simplify conditionBrendan Abolivier2019-06-051-3/+2
| * | Merge branch 'develop' into m-heroes-empty-room-nameBrendan Abolivier2019-06-0515-254/+832
| |\ \
| * | | LintKatie Wolfe2019-04-241-1/+1
| * | | Clean up codeKatie Wolfe2019-04-241-2/+3
| * | | Show heroes if room name or canonical alias are emptyKatie Wolfe2019-04-241-3/+4
| * | | Show heroes if room name or canonical alias are emptyKatie Wolfe2019-04-241-5/+3
* | | | Merge pull request #5355 from matrix-org/babolivier/heroes_left_membersBrendan Abolivier2019-06-061-15/+19
|\ \ \ \
| * | | | Do user_id != me checks before deciding whether we should pick heroes from th...Brendan Abolivier2019-06-051-15/+19
| | |/ / | |/| |
* | | | Fix background updates to handle redactions/rejections (#5352)Erik Johnston2019-06-062-9/+20
* | | | Add logging when request fails and clarify we ignore errors.Erik Johnston2019-06-051-4/+12
* | | | Fix handling of failures when calling /event_auth.Erik Johnston2019-06-031-12/+38
|/ / /
* | | Merge pull request #5309 from matrix-org/rav/limit_displayname_lengthRichard van der Hoff2019-06-012-0/+15
|\ \ \
| * | | Limit displaynames and avatar URLsRichard van der Hoff2019-06-012-0/+15
* | | | Fix "db txn 'update_presence' from sentinel context" log messages (#5275)Richard van der Hoff2019-05-281-52/+47
* | | | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-242-0/+6
|\ \ \ \
| * | | | Don't bundle aggs for /state and /members etc APIsErik Johnston2019-05-241-0/+3
| * | | | Don't bundle events in /sync or /eventsErik Johnston2019-05-211-0/+3
* | | | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+7
* | | | | Simplifications and comments in do_auth (#5227)Richard van der Hoff2019-05-231-120/+181
* | | | | Room Statistics (#4338)Amber Brown2019-05-211-0/+325
| |/ / / |/| | |
* | | | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactionsErik Johnston2019-05-211-1/+15
|\ \ \ \
| * | | | Fix wordsErik Johnston2019-05-211-3/+3
| * | | | Block attempts to annotate the same event twiceErik Johnston2019-05-201-1/+15
| |/ / /
* / / / Exclude soft-failed events from fwd-extremity candidates. (#5146)Richard van der Hoff2019-05-211-1/+6
|/ / /
* | | Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-201-1/+10
* | | fix mapping of return values for get_or_register_3pid_guest (#5177)bytepoets-blo2019-05-171-1/+1
* | | Add option to disable per-room profilesBrendan Abolivier2019-05-161-0/+9
* | | Make /sync attempt to return device updates for both joined and invited users...Matthew Hodgson2019-05-161-19/+25
* | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-2/+2
* | | Allow client event serialization to be asyncErik Johnston2019-05-145-52/+71
* | | add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-081-0/+43
* | | Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-082-4/+33
* | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_inviteErik Johnston2019-05-071-0/+11
|\ \ \
| * | | Rate limit earlyErik Johnston2019-05-021-2/+3
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_...Erik Johnston2019-04-263-0/+263
| |\ \ \
| * | | | Ratelimit 3pid invitesErik Johnston2019-04-261-0/+10
* | | | | Add some limitations to alias creationBrendan Abolivier2019-05-022-2/+23
| |/ / / |/| | |
* | | | Fix infinite loop in presence handlerRichard van der Hoff2019-04-261-0/+5
| |/ / |/| |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-1715-237/+275
|\ \ \
| * \ \ Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-0/+228
| |\ \ \ | | |_|/ | |/| |
| * | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-041-0/+5
| | |/ | |/|
| * | Prevent kicking users who aren't in the room (#4999)Andrew Morgan2019-04-041-0/+9
| * | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-038-14/+14
| * | Remove presence lists (#4989)Neil Johnson2019-04-031-165/+2
| * | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-033-15/+71
| |\ \
| | * | Correctly handle id_server paramErik Johnston2019-04-021-0/+1
| | * | Remove threepid binding if id server returns 400/404/501Erik Johnston2019-04-021-9/+10
| | * | Fixup docstringsErik Johnston2019-04-021-2/+4
| | * | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-013-7/+18
| | * | For unbind poke IS used during binding of 3PIDErik Johnston2019-04-011-9/+35
| | * | Track IS used to bind 3PIDsErik Johnston2019-04-011-0/+15
| * | | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-021-0/+1
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-013-18/+13
| |/ /
| * | Allow password providers to bind emails (#4947)Andrew Morgan2019-03-281-0/+17
| * | Use an assertErik Johnston2019-03-281-2/+1
| * | Review commentsErik Johnston2019-03-281-44/+62
| * | Use event streams to calculate presenceErik Johnston2019-03-271-29/+130
* | | Add management endpoints for account validityBrendan Abolivier2019-04-171-4/+29
| |/ |/|
* | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-0/+228
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-263-8/+51
* Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-252-46/+75
* Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-212-2/+11
|\
| * Deny peeking into rooms that have been blockedErik Johnston2019-03-212-2/+11
* | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-214-2/+13
|\|
| * Revert spurious deleteErik Johnston2019-03-201-0/+4
| * Use flagsErik Johnston2019-03-204-13/+13
| * Move requester check into assert_accepted_privacy_policyErik Johnston2019-03-201-5/+8
| * Only require consent for events with an associated requestErik Johnston2019-03-201-1/+5
* | Merge pull request #4896 from matrix-org/erikj/disable_room_directoryErik Johnston2019-03-212-0/+22
|\ \ | |/ |/|
| * Disable publishing to room list when its disabledErik Johnston2019-03-201-0/+8
| * Pull out config optionErik Johnston2019-03-201-3/+3
| * Return before we logErik Johnston2019-03-201-4/+5
| * Add option to disable search room listsErik Johnston2019-03-191-0/+13
* | Batch up outgoing read-receipts to reduce federation traffic. (#4890)Richard van der Hoff2019-03-201-1/+1
|/
* fix test_auto_create_auto_join_where_no_consent (#4886)Neil Johnson2019-03-192-3/+15
* Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-191-160/+13
* Add ratelimiting on failed login attempts (#4865)Brendan Abolivier2019-03-181-5/+23
* Add ratelimiting on login (#4821)Brendan Abolivier2019-03-152-2/+38
* Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_workerRichard van der Hoff2019-03-151-55/+24
|\
| * Move client receipt processing to federation sender worker.Richard van der Hoff2019-03-131-33/+4
| * declare a ReadReceipt classRichard van der Hoff2019-03-131-24/+22
* | Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-141-48/+77
|\ \ | |/ |/|
| * fixupAmber Brown2019-03-131-1/+1
| * fixupAmber Brown2019-03-121-47/+70
| * fixesAmber Brown2019-03-121-39/+6
| * initialAmber Brown2019-03-111-1/+40
* | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-121-0/+4
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_...Erik Johnston2019-03-084-205/+155
|\
| * Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-081-3/+7
| |\
| | * When re-syncing device lists reset the stateErik Johnston2019-03-071-3/+7
| * | Add some debug logging for device list handlingErik Johnston2019-03-071-2/+38
| |/
| * Rewrite userdir to be faster (#4537)Amber Brown2019-03-071-185/+37
| * Merge pull request #4815 from matrix-org/erikj/docstringsErik Johnston2019-03-061-7/+26
| |\
| | * Add docstrings from matrix-org-hotfixesErik Johnston2019-03-061-7/+26
| * | Port #4422 debug logging from hotfixesErik Johnston2019-03-061-7/+46
| |/
| * Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-061-1/+1
| * Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-063-3/+3
| * Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-053-3/+3
* | Factor out soft fail checksErik Johnston2019-03-081-5/+22
* | Implement soft failErik Johnston2019-03-061-1/+76
|/
* Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-052-10/+33
* Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-051-0/+46
|\
| * clarify commentsErik Johnston2019-03-051-8/+11
| * Only check history visibility when filteringErik Johnston2019-03-041-1/+3
| * s/get_forward_events/get_successor_events/Erik Johnston2019-03-041-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n...Erik Johnston2019-03-046-52/+137
| |\
| * | Update commentsErik Johnston2019-02-271-3/+13
| * | Stop backpaginating when events not visibleErik Johnston2019-02-201-0/+31
* | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-051-168/+174
|\ \ \
| * | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-041-2/+2
| * | | Split DeviceHandler into master and workerErik Johnston2019-03-041-168/+174
* | | | Clean up read-receipt handling.Richard van der Hoff2019-03-041-59/+44
|/ / /
* | / Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-043-5/+5
| |/ |/|
* | Fix incorrect log about not persisting duplicate state event. (#4776)Richard van der Hoff2019-03-011-3/+4
* | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room...Andrew Morgan2019-02-2621-482/+1672
|\ \
| * | Revert "Prevent showing non-fed rooms in fed /publicRooms"Andrew Morgan2019-02-261-65/+11
| * | Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-261-11/+65
| |\ \
| | * | Cleaner chunk logicAndrew Morgan2019-02-261-5/+4
| | * | Correct indentAndrew Morgan2019-02-261-3/+3
| | * | Correct docstring types and chunk logicAndrew Morgan2019-02-261-10/+11
| | * | Clean up room chunk logicAndrew Morgan2019-02-261-6/+8
| | * | Make not showing non-federated rooms the defaultAndrew Morgan2019-02-261-1/+1
| | * | Result may be NoneAndrew Morgan2019-02-261-1/+1
| | * | Address rich commentsAndrew Morgan2019-02-261-6/+30
| | * | elif not else ifAndrew Morgan2019-02-251-1/+1
| | * | syntax derpAndrew Morgan2019-02-251-1/+1
| | * | Simplify call to generate_room_entryAndrew Morgan2019-02-251-17/+13