summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* PR feedback pt. 1David Baker2018-10-123-29/+22
* Fix mergefailDavid Baker2018-10-091-1/+1
* Add changelogDavid Baker2018-10-091-0/+1
* isortDavid Baker2018-10-091-1/+1
* Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-09210-3221/+5551
|\
| * Merge pull request #4017 from matrix-org/rav/optimise_filter_events_for_serverRichard van der Hoff2018-10-092-7/+7
| |\
| | * Optimisation for filter_events_for_serverRichard van der Hoff2018-10-082-7/+7
| |/
| * Merge pull request #3995 from matrix-org/rav/no_deextrem_outliersRichard van der Hoff2018-10-042-33/+70
| |\
| | * actually exclude outliersRichard van der Hoff2018-10-031-1/+2
| | * fix newsfile nameRichard van der Hoff2018-10-031-0/+0
| | * remove debuggingRichard van der Hoff2018-10-021-10/+0
| | * Fix bug in forward_extremity update logicRichard van der Hoff2018-10-022-33/+79
| * | Merge branch 'master' into developAmber Brown2018-10-0463-66/+88
| |\ \
| | * | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6Amber Brown2018-10-042-1/+9
| | * | full versionAmber Brown2018-10-041-1/+1
| | * | Merge pull request #4002 from matrix-org/rav/pin_prometheusRichard van der Hoff2018-10-032-1/+5
| | |\ \
| | | * | Pin to prometheus_client<0.4 to avoid renaming all of our metricsRichard van der Hoff2018-10-032-1/+5
| | |/ /
| | * | Merge pull request #3998 from matrix-org/michaelkaye/build_docker_images_of_r...Richard van der Hoff2018-10-031-1/+1
| | |\ \
| | | * | Docker build all tags starting vX.Y.Z, inc RCsMichael Kaye2018-10-031-1/+1
| | |/ /
| | * | some changelog fixesAmber Brown2018-10-031-8/+4
| | * | changelog v0.33.6rc1Amber Brown2018-10-0360-61/+75
| | * | versionAmber Brown2018-10-031-1/+1
| | |/
| * | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetionErik Johnston2018-10-032-5/+3
| |\ \
| | * | Sanitise error messages when user doesn't have permission to inviteErik Johnston2018-10-031-5/+2
| | * | NewsfileErik Johnston2018-10-031-0/+1
| | * | Fix handling of rejected threepid invitesErik Johnston2018-10-031-1/+1
| | |/
| * | Merge pull request #3996 from matrix-org/erikj/fix_bg_iterationErik Johnston2018-10-032-2/+7
| |\ \
| | * | NewsfileErik Johnston2018-10-031-0/+1
| | * | Fix exception in background metrics collectionErik Johnston2018-10-031-2/+6
| | |/
| * | Merge pull request #3997 from matrix-org/erikj/fix_profile_error_handlingErik Johnston2018-10-032-6/+3
| |\ \ | | |/ | |/|
| | * NewsfileErik Johnston2018-10-031-0/+1
| | * Fix exception handling in fetching remote profilesErik Johnston2018-10-031-6/+2
| |/
| * Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cacheErik Johnston2018-10-023-1/+47
| |\
| | * Add testsErik Johnston2018-10-021-0/+45
| | * NewsfileErik Johnston2018-10-021-0/+1
| | * Fix bug when invalidating destination retry timingsErik Johnston2018-10-021-1/+1
| * | Remove Jenkins & other old dev junk (#3988)Amber Brown2018-10-0312-278/+4
| |/
| * Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_errorRichard van der Hoff2018-10-022-2/+3
| |\
| | * Merge branch 'develop' into rav/fix_missing_create_event_errorRichard van der Hoff2018-10-0168-442/+779
| | |\
| | * | changelogRichard van der Hoff2018-09-261-0/+1
| | * | Fix error handling for missing auth_eventRichard van der Hoff2018-09-261-2/+2
| * | | Disable frozen dicts by default (#3987)Amber Brown2018-10-024-5/+18
| * | | Merge pull request #3990 from matrix-org/erikj/fix_logging_lost_connectionErik Johnston2018-10-022-6/+22
| |\ \ \
| | * | | NewsfileErik Johnston2018-10-021-0/+1
| | * | | 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-023-22/+24
| |\ \ \
| | * | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-013-22/+24
| | | |/ | | |/|
| * | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-022-2/+3
| |\ \ \ | | |/ / | |/| |
| | * | NewsfileErik Johnston2018-10-011-0/+1
| | * | Fix lazy loaded sync with rejected state eventsErik Johnston2018-10-011-2/+2
| * | | Update instructions to point to pip install (#3985)Amber Brown2018-10-024-61/+29
| * | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-013-118/+47
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-2731-38/+117
| | |\ \ \
| | * | | | Remove redundant, failing, testRichard van der Hoff2018-09-271-106/+0
| | * | | | changelogRichard van der Hoff2018-09-271-0/+1
| | * | | | 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-026-96/+240
| | |_|/ / | |/| | |
| * | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cacheErik Johnston2018-10-013-3/+45
| |\ \ \ \
| | * | | | 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-2851-426/+696
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-266-187/+440
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2551-62/+128
| | |\ \ \ \ \
| | * | | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-211-12/+9
| | * | | | | | NewsfileErik Johnston2018-09-211-0/+1
| | * | | | | | 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
| * | | | | | | Further reduce the size of the docker image (#3972)Richard van der Hoff2018-10-012-25/+47
| * | | | | | | add --no-admin flag to registration script (#3836)Bruno Windels2018-09-282-4/+15
| * | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-283-30/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Fix complete fail to do the right thingRichard van der Hoff2018-09-282-1/+3
| | * | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | * | | | | | | remove spurious federation checks on localhostRichard van der Hoff2018-09-261-31/+6
| * | | | | | | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_callRichard van der Hoff2018-09-282-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove redundant call to start_get_pdu_cacheRichard van der Hoff2018-09-282-1/+1
| | | |_|_|_|/ / / | | |/| | | | | |
| * / | | | | | | build python 3 docker images on circle CI (#3976)Jan Christian Grünhage2018-09-282-5/+12
| |/ / / / / / /
| * | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-272-3/+20
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-19177-1345/+2545
| | |\ \ \ \ \ \ \
| | * | | | | | | | NewsfileErik Johnston2018-09-191-0/+1
| | * | | | | | | | Improve performance of getting typing updates for replicationErik Johnston2018-09-051-3/+19
| * | | | | | | | | Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_uploadRichard van der Hoff2018-09-272-0/+27
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Do the changelog.d danceMichael Kaye2018-09-271-0/+1
| | * | | | | | | | | Make a ":latest" tag, and a SHA1 commit ID one too.Michael Kaye2018-09-271-3/+16
| | * | | | | | | | | Also, don't run this job on any branchesMichael Kaye2018-09-271-1/+3
| | * | | | | | | | | Make username configurable in the UI tooMichael Kaye2018-09-271-1/+1
| | * | | | | | | | | Fix typoMichael Kaye2018-09-271-1/+1
| | * | | | | | | | | Build and push docker image to hubMichael Kaye2018-09-271-0/+11
| * | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-273-4/+11
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | more commentsRichard van der Hoff2018-09-272-6/+3
| | * | | | | | | | | changelogRichard van der Hoff2018-09-271-0/+1
| | * | | | | | | | | 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-272-2/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | * | | | | | | | | 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-2719-19/+20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update 3970.bugfixAmber Brown2018-09-271-1/+1
| | * | | | | | | | | Added changelog fragmentSchnuffle2018-09-271-0/+1
| | * | | | | | | | | Replaced all occurences of e.message with str(e)Schnuffle2018-09-2718-19/+19
| * | | | | | | | | | Run our oldest supported configuration in CI (#3952)Amber Brown2018-09-274-13/+38
| * | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upsertsRichard van der Hoff2018-09-272-1/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | towncrierNeil Johnson2018-09-261-0/+1
| | * | | | | | | | | fix #3854Neil Johnson2018-09-261-1/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-273-2/+17
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Logging improvementsRichard van der Hoff2018-09-263-2/+17
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-276-57/+115
| * | | | | | | | | docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-273-8/+62
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3963 from matrix-org/rav/get_state_for_room_docstringAmber Brown2018-09-272-4/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | * | | | | | | fix docstring for FederationClient.get_state_for_roomRichard van der Hoff2018-09-261-4/+4
| |/ / / / / / /
| * / / / / / / Reduce the load on our CI (#3957)Amber Brown2018-09-273-8/+30
| |/ / / / / /
| * | | | | | Merge branch 'develop' into rav/hacky_cache_factor_fixRichard van der Hoff2018-09-266-315/+320
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_lenRichard van der Hoff2018-09-263-20/+25
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Log which cache is throwing exceptionsRichard van der Hoff2018-09-261-10/+17
| | | * | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | | * | | | | Fix ExpiringCache.__len__ to be accurateErik Johnston2018-09-261-10/+7
| | * | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctlAmber Brown2018-09-263-285/+285
| | |\ \ \ \ \ \
| | | * | | | | | changelogRichard van der Hoff2018-09-251-0/+1
| | | * | | | | | Move synctl into top dir to avoid a symlinkRichard van der Hoff2018-09-252-285/+284
| * | | | | | | | Actuall set cache factors in workersErik Johnston2018-09-261-5/+15
| |/ / / / / / /
| * | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-263-24/+48
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | changelogRichard van der Hoff2018-09-201-0/+1
| | * | | | | | Comments and interface cleanup for on_receive_pduRichard van der Hoff2018-09-202-24/+47
| * | | | | | | Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3Richard van der Hoff2018-09-253-2/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Update DockerfileJan Christian Grünhage2018-09-251-1/+0
| | * | | | | | | Update .dockerignoreJan Christian Grünhage2018-09-251-1/+0
| | * | | | | | | add changelogJan Christian Grünhage2018-09-201-0/+1
| | * | | | | | | make python 3 work in the docker containerJan Christian Grünhage2018-09-203-2/+6
| * | | | | | | | Update grafana dashboardRichard van der Hoff2018-09-251-175/+417
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-2517-39/+13
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | NewsfileErik Johnston2018-09-211-0/+1
| | * | | | | | Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-2116-39/+12
| * | | | | | | added "media-src: 'self'" to CSP for resources (#3578)Jérémy Farnaud2018-09-252-0/+2
| * | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregisteredRichard van der Hoff2018-09-252-14/+36
| |\ \ \ \ \ \ \
| | * | | | | | | NewsfileErik Johnston2018-09-201-0/+1
| | * | | | | | | Fix spurious exceptions when client closes conncetionErik Johnston2018-09-201-14/+35
| * | | | | | | | Merge pull request #3947 from matrix-org/rav/attr_versionRichard van der Hoff2018-09-252-1/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | changelogRichard van der Hoff2018-09-251-0/+1
| | * | | | | | | We require attrs 16.0.0Richard van der Hoff2018-09-251-1/+3
| |/ / / / / / /
| * | | | | | | Only lazy load self-members on initial syncMatthew Hodgson2018-09-252-5/+9
| * | | | | | | Merge branch 'master' into developAmber Brown2018-09-253-3/+13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'v0.33.5.1'Amber Brown2018-09-253-3/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | changelog v0.33.5.1 github/release-v0.33.5.1 release-v0.33.5.1Amber Brown2018-09-252-2/+10
| | | * | | | | | | bump versionAmber Brown2018-09-251-1/+1
| | | * | | | | | | changelog for 3940Amber Brown2018-09-251-0/+2
| | | * | | | | | | Fix compatibility issue with older Twisted in tests.Oleg Girko2018-09-251-2/+2
| * | | | | | | | | Merge branch 'master' into developAmber Brown2018-09-2442-40/+65
| |\| | | | | | | | | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge tag 'v0.33.5'Amber Brown2018-09-2487-1091/+1998
| | |\| | | | | |
| | | * | | | | | towncrier v0.33.5 github/release-v0.33.5 release-v0.33.5Amber Brown2018-09-241-0/+6
| | | * | | | | | update versionAmber Brown2018-09-241-1/+1
| | | * | | | | | changelog v0.33.5rc1Amber Brown2018-09-1741-39/+58
| | | * | | | | | update python 3 changelogAmber Brown2018-09-171-1/+1
| | | * | | | | | versionAmber Brown2018-09-171-1/+1
| * | | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errorsErik Johnston2018-09-212-0/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add missing loggerErik Johnston2018-09-201-0/+4
| | * | | | | | | | NewsfileErik Johnston2018-09-201-0/+1
| | * | | | | | | | 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-202-0/+5
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_linksNeil Johnson2018-09-202-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail...Richard van der Hoff2018-09-1831-98/+351
| | |\ \ \ \ \ \
| | * | | | | | | towncrierNeil Johnson2018-09-131-0/+1
| | * | | | | | | 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-209-58/+238
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cacheErik Johnston2018-09-202-8/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix up changelog and remove spurious commentErik Johnston2018-09-192-3/+1
| | * | | | | | | pep8Erik Johnston2018-09-191-1/+0
| | * | | | | | | NewsfileErik Johnston2018-09-191-0/+1
| | * | | | | | | Remove get_destination_retry_timings cacheErik Johnston2018-09-191-5/+0
| * | | | | | | | Add a way to run tests in PostgreSQL in Docker (#3699)Amber Brown2018-09-208-9/+79
| * | | | | | | | Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-204-5/+77
| * | | | | | | | Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-193-56/+111
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #3910 from matrix-org/erikj/update_timeoutErik Johnston2018-09-195-87/+52
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | FixupErik Johnston2018-09-192-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
| | * | | | | | NewsfileErik Johnston2018-09-191-0/+1
| | * | | | | | Update to use new timeout function everywhere.Erik Johnston2018-09-194-72/+43
| |/ / / / / /
| * | | | | | update changelog for #3909Richard van der Hoff2018-09-191-1/+1
| * | | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-192-4/+5
| |\ \ \ \ \ \
| | * | | | | | ChangelogTravis Ralston2018-09-181-0/+1
| | * | | | | | Destination is a stringTravis Ralston2018-09-181-4/+4
| * | | | | | | Remove documentation referencing Cygwin (#3873)Amber Brown2018-09-193-31/+10
| * | | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_nameAmber Brown2018-09-192-3/+11
| |\ \ \ \ \ \ \
| | * | | | | | | changelogRichard van der Hoff2018-09-181-0/+1
| | * | | | | | | 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-192-1/+31
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | changelogRichard van der Hoff2018-09-181-0/+1
| | * | | | | | 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-182-0/+6
| * | | | | | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-185-186/+359
| * | | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_versionAmber Brown2018-09-192-0/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Create 3894.featureWill Hunt2018-09-171-0/+1
| | * | | | | 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-182-0/+2
| |\ \ \ \ \ \
| | * | | | | | changelogMatthew Hodgson2018-09-151-0/+1
| | * | | | | | don't ratelimit autojoinsMatthew Hodgson2018-09-151-0/+1
| * | | | | | | Merge pull request #3882 from SimmyD/max_upload_docker_varRichard van der Hoff2018-09-183-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.Simon Dwyer2018-09-161-0/+1
| | * | | | | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.Simon Dwyer2018-09-161-1/+1
| | * | | | | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.Simon Dwyer2018-09-161-0/+1
| | * | | | | | | Added 'MAX_UPLOAD_SIZE' variable and set default to "10M"Simon Dwyer2018-09-161-1/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_aliasRichard van der Hoff2018-09-183-4/+17
| |\ \ \ \ \ \ \
| | * | | | | | | Reinstate missing null checkRichard van der Hoff2018-09-171-1/+1
| | * | | | | | | changelogRichard van der Hoff2018-09-171-0/+1
| | * | | | | | | Return a 404 when deleting unknown room aliasRichard van der Hoff2018-09-172-4/+16
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metricsRichard van der Hoff2018-09-183-12/+13
| |\ \ \ \ \ \ \
| | * | | | | | | changelogRichard van der Hoff2018-09-171-0/+1
| | * | | | | | | Fix more b'abcd' noise in metricsRichard van der Hoff2018-09-172-12/+12
| * | | | | | | | Merge pull request #3897 from aaronraimist/synaspse-typoRichard van der Hoff2018-09-182-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add changelogAaron Raimist2018-09-171-0/+1
| | * | | | | | | | Fix typo in README, synaspse -> synapseAaron Raimist2018-09-171-1/+1
| |/ / / / / / / /
| * | | | / / / / Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logsRichard van der Hoff2018-09-173-5/+9
| |\| | | | | | | | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | changelogRichard van der Hoff2018-09-171-0/+1
| | * | | | | | Fix some b'abcd' noise in logs and metricsRichard van der Hoff2018-09-172-5/+8
| |/ / / / / /
| * / / / / / README: run python_dependencies with -mRichard van der Hoff2018-09-171-1/+1
| |/ / / / /
| * | | | | Merge pull request #3888 from matrix-org/rav/nuke_nuke_roomsAmber Brown2018-09-172-57/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | changelogRichard van der Hoff2018-09-171-0/+1
| | * | | | Remove nuke-room-from-db.sh scriptRichard van der Hoff2018-09-171-57/+0
| |/ / / /
| * | | | missing changelogMatthew Hodgson2018-09-151-0/+1
| * | | | mention libjemalloc in readme (#3877)Vincent Breitmoser2018-09-151-0/+8
| * | | | Fix timeout functionErik Johnston2018-09-151-1/+2
| * | | | Merge pull request #3875 from matrix-org/erikj/extra_timeoutsErik Johnston2018-09-143-0/+63
| |\ \ \ \
| | * | | | NewsfileErik Johnston2018-09-141-0/+1
| | * | | | 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-142-8/+1
| * | | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2Erik Johnston2018-09-145-7/+13
| |\ \ \ \
| | * | | | fixAmber Brown2018-09-151-3/+3
| | * | | | changelogAmber Brown2018-09-151-0/+1
| | * | | | 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-148-61/+55
| | |\| | |
| | * | | | buffer?Amber Brown2018-09-141-1/+2
| * | | | | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metricsErik Johnston2018-09-145-4/+217
| |\ \ \ \ \
| | * | | | | Remove spurious commentErik Johnston2018-09-141-2/+0
| | * | | | | Measure outbound requestsErik Johnston2018-09-141-3/+6
| | * | | | | NewsfileErik Johnston2018-09-141-0/+1
| | * | | | | TestsErik Johnston2018-09-141-0/+81
| | * | | | | Add in flight real time metrics for Measure blocksErik Johnston2018-09-142-1/+131
| |/ / / / /
| * | | | | Merge pull request #3860 from matrix-org/travis/typo-1Travis Ralston2018-09-132-1/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Create 3860.miscTravis Ralston2018-09-131-0/+1
| | * | | | Fix minor typo in exceptionTravis Ralston2018-09-131-1/+1
| |/ / / /
| * / / / merge (#3576)Amber Brown2018-09-148-61/+55
| |/ / /
| * | | Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8Erik Johnston2018-09-132-16/+29
| |\ \ \
| | * | | commentErik Johnston2018-09-131-0/+2