summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Expand)AuthorAgeFilesLines
* synapse/visibility.py: fix SyntaxError on py3.7Ivan Shapovalov2018-10-141-0/+1
* Make workers work on Py3 (#4027)Amber Brown2018-10-131-0/+1
* Update newsfileErik Johnston2018-10-101-1/+1
* NewsfileErik Johnston2018-10-091-0/+1
* Merge pull request #4008 from matrix-org/erikj/log_looping_exceptionsErik Johnston2018-10-091-0/+1
|\
| * NewsfileErik Johnston2018-10-051-0/+1
* | Optimisation for filter_events_for_serverRichard van der Hoff2018-10-081-0/+1
|/
* Merge pull request #3995 from matrix-org/rav/no_deextrem_outliersRichard van der Hoff2018-10-041-0/+1
|\
| * fix newsfile nameRichard van der Hoff2018-10-031-0/+0
| * Fix bug in forward_extremity update logicRichard van der Hoff2018-10-021-0/+1
* | Merge branch 'master' into developAmber Brown2018-10-0459-61/+0
|\ \
| * | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6Amber Brown2018-10-041-1/+0
| * | Pin to prometheus_client<0.4 to avoid renaming all of our metricsRichard van der Hoff2018-10-031-0/+1
| * | changelog v0.33.6rc1Amber Brown2018-10-0359-61/+0
| |/
* | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetionErik Johnston2018-10-031-0/+1
|\ \
| * | NewsfileErik Johnston2018-10-031-0/+1
| |/
* | Merge pull request #3996 from matrix-org/erikj/fix_bg_iterationErik Johnston2018-10-031-0/+1
|\ \
| * | NewsfileErik Johnston2018-10-031-0/+1
| |/
* / NewsfileErik Johnston2018-10-031-0/+1
|/
* Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cacheErik Johnston2018-10-021-0/+1
|\
| * NewsfileErik Johnston2018-10-021-0/+1
* | Remove Jenkins & other old dev junk (#3988)Amber Brown2018-10-031-0/+1
|/
* Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_errorRichard van der Hoff2018-10-021-0/+1
|\
| * Merge branch 'develop' into rav/fix_missing_create_event_errorRichard van der Hoff2018-10-0121-0/+21
| |\
| * | changelogRichard van der Hoff2018-09-261-0/+1
* | | Disable frozen dicts by default (#3987)Amber Brown2018-10-021-0/+1
* | | NewsfileErik Johnston2018-10-021-0/+1
* | | Merge pull request #3989 from matrix-org/rav/better_stacktracesRichard van der Hoff2018-10-021-0/+1
|\ \ \
| * | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-011-0/+1
| | |/ | |/|
* | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-021-0/+1
|\ \ \ | |/ / |/| |
| * | NewsfileErik Johnston2018-10-011-0/+1
* | | Update instructions to point to pip install (#3985)Amber Brown2018-10-021-0/+1
* | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-276-0/+6
| |\ \ \
| * | | | changelogRichard van der Hoff2018-09-271-0/+1
* | | | | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-021-0/+1
| |_|/ / |/| | |
* | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cacheErik Johnston2018-10-011-0/+1
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2814-0/+14
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-262-0/+2
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2544-39/+4
| |\ \ \ \ \
| * | | | | | NewsfileErik Johnston2018-09-211-0/+1
* | | | | | | Further reduce the size of the docker image (#3972)Richard van der Hoff2018-10-011-0/+1
* | | | | | | add --no-admin flag to registration script (#3836)Bruno Windels2018-09-281-0/+1
* | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
* | | | | | | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_callRichard van der Hoff2018-09-281-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove redundant call to start_get_pdu_cacheRichard van der Hoff2018-09-281-0/+1
| | |_|_|_|/ / / | |/| | | | | |
* / | | | | | | build python 3 docker images on circle CI (#3976)Jan Christian Grünhage2018-09-281-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-1980-27/+53
| |\ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2018-09-191-0/+1
* | | | | | | | | Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_uploadRichard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do the changelog.d danceMichael Kaye2018-09-271-0/+1
* | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | changelogRichard van der Hoff2018-09-271-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_processAmber Brown2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update 3970.bugfixAmber Brown2018-09-271-1/+1
| * | | | | | | | | Added changelog fragmentSchnuffle2018-09-271-0/+1
* | | | | | | | | | Run our oldest supported configuration in CI (#3952)Amber Brown2018-09-271-0/+1
* | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upsertsRichard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | towncrierNeil Johnson2018-09-261-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Logging improvementsRichard van der Hoff2018-09-261-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-271-0/+1
* | | | | | | | | docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-271-0/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
|/ / / / / / /
* / / / / / / Reduce the load on our CI (#3957)Amber Brown2018-09-271-0/+1
|/ / / / / /
* | | | | | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_lenRichard van der Hoff2018-09-261-0/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | changelogRichard van der Hoff2018-09-261-0/+1
* | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctlAmber Brown2018-09-261-0/+1
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-09-251-0/+1
* | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-261-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | changelogRichard van der Hoff2018-09-201-0/+1
* | | | | | | Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3Richard van der Hoff2018-09-251-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | add changelogJan Christian Grünhage2018-09-201-0/+1
* | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-251-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | NewsfileErik Johnston2018-09-211-0/+1
* | | | | | | 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-0/+1
|\ \ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2018-09-201-0/+1
* | | | | | | | changelogRichard van der Hoff2018-09-251-0/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Only lazy load self-members on initial syncMatthew Hodgson2018-09-251-0/+1
* | | | | | | Merge branch 'master' into developAmber Brown2018-09-2440-39/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errorsErik Johnston2018-09-211-0/+1
|\ \ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2018-09-201-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916)Matthew Hodgson2018-09-201-0/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_linksNeil Johnson2018-09-201-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail...Richard van der Hoff2018-09-1813-0/+12
| |\ \ \ \ \
| * | | | | | towncrierNeil Johnson2018-09-131-0/+1
* | | | | | | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-201-0/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cacheErik Johnston2018-09-201-0/+1
|\ \ \ \ \ \
| * | | | | | Fix up changelog and remove spurious commentErik Johnston2018-09-191-1/+1
| * | | | | | NewsfileErik Johnston2018-09-191-0/+1
* | | | | | | Add a way to run tests in PostgreSQL in Docker (#3699)Amber Brown2018-09-201-0/+2
* | | | | | | Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-201-0/+1
* | | | | | | Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-191-0/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | FixupErik Johnston2018-09-191-0/+0
* | | | | | NewsfileErik Johnston2018-09-191-0/+1
|/ / / / /
* | | | | update changelog for #3909Richard van der Hoff2018-09-191-1/+1
* | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-191-0/+1
|\ \ \ \ \
| * | | | | ChangelogTravis Ralston2018-09-181-0/+1
* | | | | | Remove documentation referencing Cygwin (#3873)Amber Brown2018-09-191-0/+2
* | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_nameAmber Brown2018-09-191-0/+1
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-09-181-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeoutAmber Brown2018-09-191-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | changelogRichard van der Hoff2018-09-181-0/+1
| |/ / / /
* | | | | Use directory server for room joins (#3899)Richard van der Hoff2018-09-181-0/+1
* | | | | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-181-0/+1
* | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_versionAmber Brown2018-09-191-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Create 3894.featureWill Hunt2018-09-171-0/+1
* | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoinRichard van der Hoff2018-09-181-0/+1
|\ \ \ \ \
| * | | | | changelogMatthew Hodgson2018-09-151-0/+1
* | | | | | Merge pull request #3882 from SimmyD/max_upload_docker_varRichard van der Hoff2018-09-181-0/+1
|\ \ \ \ \ \
| * | | | | | Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.Simon Dwyer2018-09-161-0/+1
| |/ / / / /
* | | | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_aliasRichard van der Hoff2018-09-181-0/+1
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-09-171-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metricsRichard van der Hoff2018-09-181-0/+1
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-09-171-0/+1
* | | | | | | Add changelogAaron Raimist2018-09-171-0/+1
|/ / / / / /
* / / / / / changelogRichard van der Hoff2018-09-171-0/+1
|/ / / / /
* / / / / changelogRichard van der Hoff2018-09-171-0/+1
|/ / / /
* | | | missing changelogMatthew Hodgson2018-09-151-0/+1
* | | | NewsfileErik Johnston2018-09-141-0/+1
* | | | don't filter membership events based on history visibility (#3874)Matthew Hodgson2018-09-141-0/+0
* | | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2Erik Johnston2018-09-141-0/+1
|\ \ \ \
| * | | | changelogAmber Brown2018-09-151-0/+1
| |/ / /
* | | | NewsfileErik Johnston2018-09-141-0/+1
* | | | Create 3860.miscTravis Ralston2018-09-131-0/+1
|/ / /
* | | merge (#3576)Amber Brown2018-09-141-0/+1
* | | Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8Erik Johnston2018-09-131-0/+1
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_p...Erik Johnston2018-09-131-0/+1
| |\ \ \
| * | | | NewsfileErik Johnston2018-09-131-0/+1
* | | | | Merge pull request #3859 from matrix-org/erikj/add_iterkeysAmber Brown2018-09-141-0/+1
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-09-131-0/+1
* | | | | | fix circleci merged builds (#3858)Amber Brown2018-09-141-0/+1
|/ / / / /
* | / / / Attempt to figure out what's going on with timeouts (#3857)Amber Brown2018-09-141-0/+1
| |/ / / |/| | |
* | | | Remove some superfluous logging (#3855)Amber Brown2018-09-131-0/+1
|/ / /
* | | Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7Neil Johnson2018-09-121-0/+1
|\ \ \
| * | | improve namingNeil Johnson2018-09-121-1/+1
| * | | towncrierNeil Johnson2018-09-121-0/+1
* | | | show heroes if a room has a 'deleted' name/canonical_alias (#3851)Matthew Hodgson2018-09-121-0/+1
* | | | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_timeErik Johnston2018-09-121-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2018-09-121-0/+1
* | | | | Merge pull request #3841 from matrix-org/erikj/manhole_key_lengthErik Johnston2018-09-121-0/+1
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-09-111-0/+1
* | | | | | Add JUnit summaries to CircleCI as well as merged runs (#3704)Amber Brown2018-09-121-0/+1
* | | | | | Port federation/ to py3 (#3847)Amber Brown2018-09-121-0/+1
* | | | | | Merge pull request #3835 from krombel/fix_3821Amber Brown2018-09-121-0/+1
|\ \ \ \ \ \
| * | | | | | add changelogKrombel2018-09-101-0/+1
* | | | | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyringAmber Brown2018-09-121-0/+1
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2018-09-071-0/+1
* | | | | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_importAmber Brown2018-09-121-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | changelogRichard van der Hoff2018-09-071-0/+1
* | | | | | | | | Port rest/ to Python 3 (#3823)Amber Brown2018-09-121-0/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Port crypto/ to Python 3 (#3822)Amber Brown2018-09-121-0/+1
* | | | | | | | NewsfileErik Johnston2018-09-121-0/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Speed up lazy loading (#3827)Matthew Hodgson2018-09-122-0/+2
| |_|_|/ / / |/| | | | |
* | | | | | NewsfileMathijs van Gorcum2018-09-101-0/+1
| |_|/ / / |/| | | |
* | | | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_joinAmber Brown2018-09-071-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | NewsfileErik Johnston2018-09-061-0/+1
* | | | | Merge branch 'master' into developAmber Brown2018-09-0727-27/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | changelog v0.33.4 github/release-v0.33.4 release-v0.33.4Amber Brown2018-09-071-1/+0
| * | | | Create 3802.miscJan Christian Grünhage2018-09-061-0/+1
| * | | | version and towncrier v0.33.4rc1Amber Brown2018-09-0427-27/+0
* | | | | Port tests/ to Python 3 (#3808)Amber Brown2018-09-071-0/+1
* | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6Neil Johnson2018-09-061-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | towncrierNeil Johnson2018-09-051-0/+1
| | |/ / | |/| |
* | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edusAmber Brown2018-09-071-0/+1
|\ \ \ \
| * | | | SpellingErik Johnston2018-09-061-1/+1
| * | | | NewsfileErik Johnston2018-09-061-0/+1
* | | | | Merge pull request #3806 from matrix-org/erikj/limit_postgres_travisAmber Brown2018-09-071-0/+1
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-09-061-0/+1
| |/ / / /
* | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_idAmber Brown2018-09-071-0/+1
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-09-031-0/+1
* | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_stateAmber Brown2018-09-071-0/+1
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2018-09-051-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_depAmber Brown2018-09-071-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | changelogRichard van der Hoff2018-09-061-0/+1
| | |_|/ / | |/| | |
* / | | | Port handlers/ to Python 3 (#3803)Amber Brown2018-09-071-0/+1
|/ / / /
* | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filterRichard van der Hoff2018-09-051-0/+1
|\ \ \ \
| * | | | changelogRichard van der Hoff2018-09-041-0/+1
| | |_|/ | |/| |
* | | | Port http/ to Python 3 (#3771)Amber Brown2018-09-061-0/+1
| |/ / |/| |
* | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5Neil Johnson2018-09-041-0/+1
|\ \ \ | |/ / |/| |
| * | towncrierNeil Johnson2018-09-041-0/+1
* | | Fix tests on postgresql (#3740)Amber Brown2018-09-041-0/+1
| |/ |/|
* | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_funcErik Johnston2018-09-031-0/+1
|\ \
| * | NewsfileErik Johnston2018-09-031-0/+1
* | | Create 3378.miscAmber Brown2018-09-031-0/+1
| |/ |/|
* | typoNeil Johnson2018-08-311-1/+1
* | news fragemntNeil Johnson2018-08-311-0/+1
* | Port storage/ to Python 3 (#3725)Amber Brown2018-08-311-0/+1
* | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_initRichard van der Hoff2018-08-301-0/+1
|\ \
| * | changelogRichard van der Hoff2018-08-281-0/+1
* | | changelogKrombel2018-08-292-1/+1
* | | fix #3445Krombel2018-08-291-0/+1
* | | Update CONTRIBUTING to clarify miscs & Markdown (#3730)Amber Brown2018-08-291-0/+1
* | | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-281-0/+1
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-241-0/+1
|\ \
| * | NewsfileErik Johnston2018-08-241-0/+1
* | | NewsfileErik Johnston2018-08-241-0/+1
|/ /
* | NewsfileErik Johnston2018-08-241-0/+1
* | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1Erik Johnston2018-08-241-0/+1
|\ \
| * | NewsfileErik Johnston2018-08-241-0/+1
* | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticseErik Johnston2018-08-241-0/+1
|\ \ \
| * | | NewsfileErik Johnston2018-08-241-0/+1
| |/ /
* | | Merge pull request #3751 from matrix-org/rav/twisted_17Richard van der Hoff2018-08-241-0/+1
|\ \ \ | |/ / |/| |
| * | changelogRichard van der Hoff2018-08-241-0/+1
* | | NewsfileErik Johnston2018-08-231-0/+1
|/ /
* | NewsfileErik Johnston2018-08-231-0/+1
* | Merge pull request #3734 from matrix-org/travis/worker-docsTravis Ralston2018-08-231-0/+1
|\ \
| * | Create 3734.miscTravis Ralston2018-08-211-0/+1
* | | NewsfileErik Johnston2018-08-231-0/+1
* | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-2240-33/+7
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into developRichard van der Hoff2018-08-221-1/+0
| |\ \
| | * | Revert "Use recaptcha_ajax.js directly from Google"Richard van der Hoff2018-08-131-1/+0
| * | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-eventErik Johnston2018-08-221-0/+1
| |\ \ \
| | * | | 3724.featureWill Hunt2018-08-201-0/+1
| * | | | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-221-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-1783-54/+25
| | |\ \ \ \
| | * | | | | NewsfileErik Johnston2018-08-091-0/+1
| * | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-221-0/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-2033-0/+33
| | |\ \ \ \ \ \
| | * | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| * | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spellingRichard van der Hoff2018-08-221-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Create 3735.miscTravis Ralston2018-08-211-0/+1
| * | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.3' into developRichard van der Hoff2018-08-221-0/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | changelogRichard van der Hoff2018-08-211-0/+1
| * | | | | | | | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-221-0/+1
| * | | | | | | | | Merge tag 'v0.33.3rc2' into developRichard van der Hoff2018-08-2142-42/+0
| |\| | | | | | | |
| | * | | | | | | | changelog v0.33.3rc2Amber Brown2018-08-211-1/+0
| | * | | | | | | | changelogRichard van der Hoff2018-08-201-0/+1
| | * | | | | | | | changelog v0.33.3rc1Amber Brown2018-08-2142-42/+0
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keysErik Johnston2018-08-211-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | NewsfileErik Johnston2018-08-211-0/+1
| | |/ / / / / / /
| * / / / / / / / NewsfileErik Johnston2018-08-201-0/+1
| |/ / / / / / /
| * | | / / / / Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-201-0/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | NewsfileErik Johnston2018-08-201-0/+1
| * | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_loggingErik Johnston2018-08-201-0/+1
| |\ \ \ \ \ \
| | * | | | | | NewsfileErik Johnston2018-08-171-0/+1
| * | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commandsRichard van der Hoff2018-08-171-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | changelogRichard van der Hoff2018-08-171-0/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updatesRichard van der Hoff2018-08-171-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | changelogRichard van der Hoff2018-08-171-0/+1
| | |/ / / / / /
| * | | | | | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-181-0/+1
| * | | | | | | Remove v1/register's broken shared secret functionality (#3703)Amber Brown2018-08-181-0/+1
| * | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-171-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | changelogRichard van der Hoff2018-08-151-0/+1
| * | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producersRichard van der Hoff2018-08-171-0/+1
| |\ \ \ \ \ \ \ \