summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Optimisation for filter_events_for_serverRichard van der Hoff2018-10-081-7/+6
* Merge pull request #3995 from matrix-org/rav/no_deextrem_outliersRichard van der Hoff2018-10-041-33/+69
|\
| * actually exclude outliersRichard van der Hoff2018-10-031-1/+2
| * remove debuggingRichard van der Hoff2018-10-021-10/+0
| * Fix bug in forward_extremity update logicRichard van der Hoff2018-10-021-33/+78
* | Merge branch 'master' into developAmber Brown2018-10-042-2/+5
|\ \
| * | full versionAmber Brown2018-10-041-1/+1
| * | Pin to prometheus_client<0.4 to avoid renaming all of our metricsRichard van der Hoff2018-10-031-1/+4
| * | versionAmber Brown2018-10-031-1/+1
| |/
* | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetionErik Johnston2018-10-031-5/+2
|\ \
| * | Sanitise error messages when user doesn't have permission to inviteErik Johnston2018-10-031-5/+2
| * | Fix handling of rejected threepid invitesErik Johnston2018-10-031-1/+1
| |/
* | Merge pull request #3996 from matrix-org/erikj/fix_bg_iterationErik Johnston2018-10-031-2/+6
|\ \
| * | Fix exception in background metrics collectionErik Johnston2018-10-031-2/+6
| |/
* / Fix exception handling in fetching remote profilesErik Johnston2018-10-031-6/+2
|/
* Fix bug when invalidating destination retry timingsErik Johnston2018-10-021-1/+1
* Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_errorRichard van der Hoff2018-10-021-2/+2
|\
| * Merge branch 'develop' into rav/fix_missing_create_event_errorRichard van der Hoff2018-10-0130-142/+299
| |\
| * | Fix error handling for missing auth_eventRichard van der Hoff2018-09-261-2/+2
* | | Disable frozen dicts by default (#3987)Amber Brown2018-10-021-3/+10
* | | Fix error when logging incomplete requestsErik Johnston2018-10-021-6/+21
* | | Merge pull request #3989 from matrix-org/rav/better_stacktracesRichard van der Hoff2018-10-022-22/+23
|\ \ \
| * | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-012-22/+23
| | |/ | |/|
* | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-021-2/+2
|\ \ \ | |/ / |/| |
| * | Fix lazy loaded sync with rejected state eventsErik Johnston2018-10-011-2/+2
* | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-12/+46
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-2720-36/+60
| |\ \ \
| * | | | Include event when resolving state for missing prevsRichard van der Hoff2018-09-271-2/+16
| * | | | Include state from remote servers in pdu handlingRichard van der Hoff2018-09-271-4/+19
| * | | | Fix "unhashable type: 'list'" exception in federation handlingRichard van der Hoff2018-09-271-7/+12
* | | | | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-021-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cacheErik Johnston2018-10-012-3/+44
|\ \ \ \
| * | | | Correctly match 'dict.pop' apiErik Johnston2018-10-011-3/+11
| * | | | Don't update eviction metrics on explicit removalErik Johnston2018-10-011-5/+0
| * | | | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2827-403/+248
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-261-10/+17
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-255-21/+48
| |\ \ \ \ \
| * | | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-211-12/+9
| * | | | | | Add a five minute cache to get_destination_retry_timingsErik Johnston2018-09-212-1/+35
| * | | | | | Make ExpiringCache slightly more performantErik Johnston2018-09-211-1/+5
* | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-282-30/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix complete fail to do the right thingRichard van der Hoff2018-09-282-1/+3
| * | | | | | | remove spurious federation checks on localhostRichard van der Hoff2018-09-261-31/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Remove redundant call to start_get_pdu_cacheRichard van der Hoff2018-09-281-1/+0
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-271-3/+19
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-1968-689/+1415
| |\ \ \ \ \ \
| * | | | | | | Improve performance of getting typing updates for replicationErik Johnston2018-09-051-3/+19
* | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-272-4/+10
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | more commentsRichard van der Hoff2018-09-272-6/+3
| * | | | | | | Clarifications in FederationHandlerRichard van der Hoff2018-09-271-2/+11
* | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_processAmber Brown2018-09-271-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Run notify_app_services as a bg processRichard van der Hoff2018-09-261-2/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-2716-17/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Replaced all occurences of e.message with str(e)Schnuffle2018-09-2716-17/+17
* | | | | | | | | Run our oldest supported configuration in CI (#3952)Amber Brown2018-09-271-13/+14
* | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upsertsRichard van der Hoff2018-09-271-1/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | fix #3854Neil Johnson2018-09-261-1/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-272-2/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Logging improvementsRichard van der Hoff2018-09-262-2/+16
| |/ / / / / / /
* | | | | | | | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-273-45/+93
* | | | | | | | docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-271-8/+22
| |/ / / / / / |/| | | | | |
* | | | | | | fix docstring for FederationClient.get_state_for_roomRichard van der Hoff2018-09-261-4/+4
|/ / / / / /
* | | | | | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_lenRichard van der Hoff2018-09-262-20/+24
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Log which cache is throwing exceptionsRichard van der Hoff2018-09-261-10/+17
| * | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-261-10/+7
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctlAmber Brown2018-09-261-284/+0
|\ \ \ \ \
| * | | | | Move synctl into top dir to avoid a symlinkRichard van der Hoff2018-09-251-284/+0
* | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-262-24/+47
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Comments and interface cleanup for on_receive_pduRichard van der Hoff2018-09-202-24/+47
* | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-2515-38/+12
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-2115-38/+12
* | | | | | added "media-src: 'self'" to CSP for resources (#3578)Jérémy Farnaud2018-09-251-0/+1
* | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregisteredRichard van der Hoff2018-09-251-14/+35
|\ \ \ \ \ \
| * | | | | | Fix spurious exceptions when client closes conncetionErik Johnston2018-09-201-14/+35
* | | | | | | We require attrs 16.0.0Richard van der Hoff2018-09-251-1/+3
| |_|_|/ / / |/| | | | |
* | | | | | Only lazy load self-members on initial syncMatthew Hodgson2018-09-251-5/+8
* | | | | | Merge branch 'master' into developAmber Brown2018-09-251-1/+1
|\ \ \ \ \ \
| * | | | | | bump versionAmber Brown2018-09-251-1/+1
* | | | | | | Merge branch 'master' into developAmber Brown2018-09-241-1/+1
|\| | | | | | | |_|/ / / / |/| | | | |
| * | | | | update versionAmber Brown2018-09-241-1/+1
| * | | | | versionAmber Brown2018-09-171-1/+1
* | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errorsErik Johnston2018-09-211-0/+6
|\ \ \ \ \ \
| * | | | | | Add missing loggerErik Johnston2018-09-201-0/+4
| * | | | | | Handle exceptions thrown by background tasksErik Johnston2018-09-201-0/+2
| | |/ / / / | |/| | | |
* | | | | | Always LL ourselves if we're in a room to simplify clients (#3916)Matthew Hodgson2018-09-201-0/+4
* | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_linksNeil Johnson2018-09-201-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail...Richard van der Hoff2018-09-1813-39/+247
| |\ \ \ \ \
| * | | | | | fix link for case that config.email_riot_base_url is setNeil Johnson2018-09-131-1/+1
* | | | | | | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-202-16/+20
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cacheErik Johnston2018-09-201-8/+0
|\ \ \ \ \ \
| * | | | | | Fix up changelog and remove spurious commentErik Johnston2018-09-191-2/+0
| * | | | | | pep8Erik Johnston2018-09-191-1/+0
| * | | | | | Remove get_destination_retry_timings cacheErik Johnston2018-09-191-5/+0
* | | | | | | Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-201-2/+2
* | | | | | | Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-192-56/+110
| |_|_|_|_|/ |/| | | | |
* | | | | | FixupErik Johnston2018-09-191-4/+1
* | | | | | Replace custom DeferredTimeoutError with defer.TimeoutErrorErik Johnston2018-09-192-12/+5
* | | | | | Run canceller first to allow it to generate correct errorErik Johnston2018-09-191-2/+5
* | | | | | Update to use new timeout function everywhere.Erik Johnston2018-09-194-72/+43
|/ / / / /
* | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-191-4/+4
|\ \ \ \ \
| * | | | | Destination is a stringTravis Ralston2018-09-181-4/+4
* | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_nameAmber Brown2018-09-191-3/+10
|\ \ \ \ \ \
| * | | | | | Set SNI to the server_name, not whatever was in the SRV recordRichard van der Hoff2018-09-181-3/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeoutAmber Brown2018-09-191-1/+30
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Bump timeout on get_missing_events requestRichard van der Hoff2018-09-181-1/+30
| |/ / / /
* | | | | Use directory server for room joins (#3899)Richard van der Hoff2018-09-181-0/+5
* | | | | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-181-149/+236
* | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_versionAmber Brown2018-09-191-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | typoWill Hunt2018-09-171-1/+1
| * | | | make pip happy?Will Hunt2018-09-171-2/+4
| * | | | Use a string for versionsWill Hunt2018-09-171-1/+1
| * | | | Add python_version phone home statWill Hunt2018-09-171-0/+2
| | |/ / | |/| |
* | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoinRichard van der Hoff2018-09-181-0/+1
|\ \ \ \
| * | | | don't ratelimit autojoinsMatthew Hodgson2018-09-151-0/+1
| |/ / /
* | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_aliasRichard van der Hoff2018-09-182-4/+16
|\ \ \ \
| * | | | Reinstate missing null checkRichard van der Hoff2018-09-171-1/+1
| * | | | Return a 404 when deleting unknown room aliasRichard van der Hoff2018-09-172-4/+16
| |/ / /
* | | | Fix more b'abcd' noise in metricsRichard van der Hoff2018-09-172-12/+12
* | | | Fix some b'abcd' noise in logs and metricsRichard van der Hoff2018-09-172-5/+8
|/ / /
* | | Fix timeout functionErik Johnston2018-09-151-1/+2
* | | Add an awful secondary timeout to fix wedged requestsErik Johnston2018-09-142-0/+62
* | | don't filter membership events based on history visibility (#3874)Matthew Hodgson2018-09-141-8/+1
* | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2Erik Johnston2018-09-144-7/+12
|\ \ \
| * | | fixAmber Brown2018-09-151-3/+3
| * | | fixAmber Brown2018-09-141-1/+4
| * | | fixAmber Brown2018-09-141-1/+1
| * | | redact betterAmber Brown2018-09-141-2/+2
| * | | we do that higher upAmber Brown2018-09-141-0/+1
| * | | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2Amber Brown2018-09-144-15/+36
| |\| |
| * | | buffer?Amber Brown2018-09-141-1/+2
* | | | Remove spurious commentErik Johnston2018-09-141-2/+0
* | | | Measure outbound requestsErik Johnston2018-09-141-3/+6
* | | | Add in flight real time metrics for Measure blocksErik Johnston2018-09-142-1/+131
* | | | Fix minor typo in exceptionTravis Ralston2018-09-131-1/+1
| |/ / |/| |
* | | merge (#3576)Amber Brown2018-09-144-15/+36
|/ /
* | Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8Erik Johnston2018-09-131-16/+28
|\ \
| * | commentErik Johnston2018-09-131-0/+2
| * | pep8Erik Johnston2018-09-131-1/+0
| * | Create indices after insertionErik Johnston2018-09-131-14/+18
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_p...Erik Johnston2018-09-132-1/+26
| |\ \
| * | | Make purge history slightly fasterErik Johnston2018-09-131-2/+9
* | | | Fix handling of redacted events from federationErik Johnston2018-09-132-1/+6
* | | | Attempt to figure out what's going on with timeouts (#3857)Amber Brown2018-09-141-56/+42
| |/ / |/| |
* | | Remove some superfluous logging (#3855)Amber Brown2018-09-132-1/+26
|/ /
* | Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7Neil Johnson2018-09-122-3/+28
|\ \
| * | improve namingNeil Johnson2018-09-122-6/+10
| * | expose number of real reserved usersNeil Johnson2018-09-122-3/+24
* | | show heroes if a room has a 'deleted' name/canonical_alias (#3851)Matthew Hodgson2018-09-121-2/+15
* | | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_timeErik Johnston2018-09-121-75/+74
|\ \ \
| * | | Log outbound requests when we retryErik Johnston2018-09-121-75/+74
* | | | argh pep8Matthew Hodgson2018-09-121-1/+1
* | | | correctly log gappy sync metricsMatthew Hodgson2018-09-121-1/+1
* | | | fix loglineMatthew Hodgson2018-09-121-1/+1
* | | | Merge pull request #3841 from matrix-org/erikj/manhole_key_lengthErik Johnston2018-09-121-13/+31
|\ \ \ \
| * | | | Change the manhole SSH key to have more bitsErik Johnston2018-09-111-13/+31
* | | | | Port federation/ to py3 (#3847)Amber Brown2018-09-123-19/+18
* | | | | Merge pull request #3835 from krombel/fix_3821Amber Brown2018-09-121-1/+5
|\ \ \ \ \
| * | | | | fix VOIP crashes under Python 3 (#3821)Krombel2018-09-101-1/+5
| |/ / / /
* | | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyringAmber Brown2018-09-123-13/+46
|\ \ \ \ \
| * | | | | clearer logging when things fail, tooRichard van der Hoff2018-09-062-7/+28
| * | | | | add some logging for the keyring queueRichard van der Hoff2018-09-061-6/+18
* | | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_importAmber Brown2018-09-122-1/+1
|\ \ \ \ \ \
| * | | | | | Fix jwt import checkRichard van der Hoff2018-09-072-1/+1
* | | | | | | Port rest/ to Python 3 (#3823)Amber Brown2018-09-1217-100/+112
| |_|_|/ / / |/| | | | |
* | | | | | Port crypto/ to Python 3 (#3822)Amber Brown2018-09-123-6/+13
* | | | | | Timeout reading body for outbound HTTP requestsErik Johnston2018-09-121-7/+45
| |_|_|/ / |/| | | |
* | | | | Speed up lazy loading (#3827)Matthew Hodgson2018-09-123-30/+157
| |_|/ / |/| | |
* | | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_joinAmber Brown2018-09-071-0/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Don't send empty tags list down syncErik Johnston2018-09-061-0/+5
| * | | Send existing room tags down sync on joinErik Johnston2018-09-061-0/+8
* | | | Merge branch 'master' into developAmber Brown2018-09-071-1/+1
|\ \ \ \
| * | | | versionAmber Brown2018-09-071-1/+1
| * | | | Bump version and changelogErik Johnston2018-09-061-1/+1
| * | | | Merge tag 'v0.33.3.1' into release-v0.33.4Erik Johnston2018-09-064-31/+125
| |\ \ \ \
| * | | | | version and towncrier v0.33.4rc1Amber Brown2018-09-041-1/+1
* | | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6Neil Johnson2018-09-061-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | ensure guests never enter mau listNeil Johnson2018-09-061-4/+3
| * | | | | guest users should not be part of mau totalNeil Johnson2018-09-051-1/+6
* | | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edusAmber Brown2018-09-071-0/+12
|\ \ \ \ \ \
| * | | | | | Limit the number of PDUs/EDUs per fedreation transactionErik Johnston2018-09-061-0/+12
* | | | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_idAmber Brown2018-09-071-12/+12
|\ \ \ \ \ \ \
| * | | | | | | Remove conn_idErik Johnston2018-09-041-2/+2
| * | | | | | | Remove conn_id from repl prometheus metricsErik Johnston2018-09-031-10/+10
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_stateAmber Brown2018-09-071-8/+8
|\ \ \ \ \ \ \
| * | | | | | | User iter* during sync state calculationsErik Johnston2018-09-051-8/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_depAmber Brown2018-09-071-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | bump dep on pyopenssl to 16.xRichard van der Hoff2018-09-061-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Port handlers/ to Python 3 (#3803)Amber Brown2018-09-076-19/+22
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2018-09-065-32/+126
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | prepare v0.33.3.1 v0.33.3.1 release-v0.33.3.1Richard van der Hoff2018-09-061-1/+1
| * | | Fix origin handling for pushed transactionsRichard van der Hoff2018-09-053-15/+15
| * | | Check that signatures on events are validRichard van der Hoff2018-09-051-16/+110
* | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filterRichard van der Hoff2018-09-052-13/+39
|\ \ \ \
| * | | | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-042-13/+39
| | |_|/ | |/| |
* | | | Port http/ to Python 3 (#3771)Amber Brown2018-09-066-184/+130
| |_|/ |/| |
* | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5Neil Johnson2018-09-042-7/+21
|\ \ \ | |/ / |/| |
| * | improve human readable error messageNeil Johnson2018-09-041-1/+2
| * | improve human readable error messagesNeil Johnson2018-09-042-7/+20
* | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_funcErik Johnston2018-09-033-57/+7
|\ \ \ | |/ / |/| |
| * | Remove unnecessary resolve_events_with_state_mapErik Johnston2018-08-223-57/+7
* | | assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
* | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-315-21/+35
* | | fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
* | | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-314-6/+24
* | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-314-3/+21
* | | Port storage/ to Python 3 (#3725)Amber Brown2018-08-3111-31/+77
* | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_initRichard van der Hoff2018-08-3012-48/+30
|\ \ \
| * | | use abc.abstractpropertyRichard van der Hoff2018-08-281-5/+4
| * | | Make sure that we close db connections opened during initRichard van der Hoff2018-08-2812-48/+31
* | | | fix #3445Krombel2018-08-291-2/+2
* | | | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-281-1/+8
|/ / /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-241-4/+3
|\ \ \
| * | | Fix checking if service notice room is already taggedErik Johnston2018-08-241-4/+3
* | | | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-244-8/+8
|/ / /
* | | Ensure we wake up /sync when we add tag to notice roomErik Johnston2018-08-242-2/+13
* | | Make content of tag an empty object rather than nullErik Johnston2018-08-242-2/+2
* | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1Erik Johnston2018-08-241-1/+1
|\ \ \
| * | | Fix bug when federation_domain_whitelist is an emtpy listErik Johnston2018-08-241-1/+1
* | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticseErik Johnston2018-08-241-0/+4
|\ \ \ \
| * | | | Fix bug where we broke sync when using limit_usage_by_mauErik Johnston2018-08-241-0/+4
| |/ / /
* | | | Merge pull request #3751 from matrix-org/rav/twisted_17Richard van der Hoff2018-08-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Pin to twisted 17.1 or laterRichard van der Hoff2018-08-241-1/+1
* | | | Implement trail usersErik Johnston2018-08-234-2/+43
|/ / /
* | | Fix bug where we resent "limit exceeded" server noticesErik Johnston2018-08-231-1/+5
* | | Add missing yieldErik Johnston2018-08-231-1/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-2255-603/+1130
|\| |
| * | Merge branch 'master' into developRichard van der Hoff2018-08-221-1/+1
| |\ \
| | * | Use recaptcha_ajax.js directly from GoogleRichard van der Hoff2018-08-222-196/+1
| | * | Merge tag 'v0.33.3'Richard van der Hoff2018-08-22103-916/+2769
| | |\|
| | | * bump version to 0.33.3Richard van der Hoff2018-08-221-1/+1
| | * | Revert "Use recaptcha_ajax.js directly from Google"Richard van der Hoff2018-08-132-1/+196
| * | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-eventErik Johnston2018-08-221-1/+1
| |\ \ \
| | * | | Allow guests to access /rooms/:roomId/event/:eventIdWill Hunt2018-08-201-1/+1
| * | | | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-226-42/+74
| |\ \ \ \
| | * | | | Rename WorkerProfileHandler to BaseProfileHandlerErik Johnston2018-08-222-5/+12
| | * | | | Add assert to ensure handler is only run on masterErik Johnston2018-08-221-0/+2
| | * | | | Remove redundant varsErik Johnston2018-08-221-3/+0
| | * | | | Add some fixmesErik Johnston2018-08-172-0/+6
| | * | | | Call UserDirectoryHandler methods directlyErik Johnston2018-08-174-104/+8
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-1768-538/+1330
| | |\ \ \ \
| | * | | | | Split ProfileHandler into master and workerErik Johnston2018-08-172-9/+19
| | * | | | | Remote profile cache should remain in master workerErik Johnston2018-08-171-4/+2
| | * | | | | DocstringsErik Johnston2018-08-091-1/+11
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-0930-126/+667
| | |\ \ \ \ \
| | * | | | | | Allow ratelimiting on workersErik Johnston2018-08-071-29/+29
| | * | | | | | Allow profile changes to happen on workersErik Johnston2018-08-075-8/+106
| * | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-226-271/+388
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-2081-748/+1735
| | |\ \ \ \ \ \ \
| | * | | | | | | | Remove redundant room_version checksErik Johnston2018-08-202-15/+4
| | * | | | | | | | Revert spurious changeErik Johnston2018-08-201-2/+2
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 17:51:16 +0000