summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | changelogRichard van der Hoff2018-08-151-0/+1
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-171-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-173-0/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | add new error type ResourceLimitNeil Johnson2018-08-161-0/+1
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-173-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre...Neil Johnson2018-08-171-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | For resource limit blocked users, prevent writing into roomsNeil Johnson2018-08-161-0/+1
| | | |_|_|/ / / / / | | |/| | | | | | |
| * / | | | | | | | Create 3712.miscTravis Ralston2018-08-171-0/+1
| |/ / / / / / / /
| * / / / / / / / NewsfileErik Johnston2018-08-161-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-162-0/+2
|\| | | | | | |
| * | | | | | | Add GET media/v1/config (#3184)Will Hunt2018-08-161-0/+1
| * | | | | | | lazyload aware /messages (#3589)Matthew Hodgson2018-08-161-0/+1
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-161-0/+1
|\| | | | | | |
| * | | | | | | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-161-0/+1
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-152-0/+2
|\| | | | | | |
| * | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-151-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix mau blocking calulation bug on loginNeil Johnson2018-08-151-0/+1
| * | | | | | | | Remove incorrectly re-added changelog filesRichard van der Hoff2018-08-152-2/+0
| * | | | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-153-0/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-1515-0/+15
|\| | | | | | |
| * | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-151-0/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-1573-54/+15
| | |\ \ \ \ \ \
| | * | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-151-0/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | remove changelog referencing another PRNeil Johnson2018-08-151-1/+0
| | * | | | | | Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap...Neil Johnson2018-08-151-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | update resource limit error codesNeil Johnson2018-08-151-0/+1
| | * | | | | | | update admin email to uriNeil Johnson2018-08-151-1/+1
| | |/ / / / / /
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-146-0/+6
| | |\ \ \ \ \ \
| | * | | | | | | set admin email via configNeil Johnson2018-08-131-0/+1
| * | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_nameNeil Johnson2018-08-151-0/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro...Neil Johnson2018-08-142-0/+2
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Rename MAU prometheus metricNeil Johnson2018-08-141-0/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbindErik Johnston2018-08-151-0/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Don't fail requests to unbind 3pids for non supporting ID serversErik Johnston2018-08-081-0/+1
| * | | | | | | | Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved...Neil Johnson2018-08-141-0/+1
| * | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-141-0/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Dockerised sytest (#3660)Amber Brown2018-08-141-0/+1
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po...Amber Brown2018-08-144-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Implement a new test baseclass to cut down on boilerplate (#3684)Amber Brown2018-08-141-0/+1
| | * | | | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-baseJan Christian Grünhage2018-08-141-0/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | update docker base-image to alpine 3.8Jan Christian Grünhage2018-08-091-0/+1
| | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Name changelog after PR, not bugRichard van der Hoff2018-08-131-0/+0
| | * | | | | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-131-0/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-101-0/+1
| | * | | | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-131-0/+1
| * | | | | | | | Fixes test_reap_monthly_active_users so it passes under postgresNeil Johnson2018-08-111-0/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-testsAmber Brown2018-08-111-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | changelogAmber Brown2018-08-101-0/+1
| * | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into developRichard van der Hoff2018-08-101-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | changelogRichard van der Hoff2018-08-101-0/+1
| | |/ / / / / /
| * | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-101-0/+1
| * | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-101-0/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-2750-7/+37
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_...Jeroen2018-07-1412-0/+7
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-092-0/+1
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | towncrier changelogJeroen2018-06-261-0/+1
| | / / / / / / / /
* | | | | | / / / / server notices for resource limit blockingNeil Johnson2018-08-101-0/+1
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Where server is disabled, block ability for locked out users to read new mess...Neil Johnson2018-08-091-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-091-0/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-081-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-081-0/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ability to disable client/server Synapse via conf toggleNeil Johnson2018-08-081-0/+1
* | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-08-0958-54/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | changelogAmber Brown2018-08-0758-54/+0
* | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servletErik Johnston2018-08-091-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixup wording and remove dead codeErik Johnston2018-08-091-0/+1
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r...Erik Johnston2018-08-0312-0/+12
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | NewsfileErik Johnston2018-07-311-0/+0
* | | | | | | | | | | | Test fixes for Python 3 (#3647)Amber Brown2018-08-091-0/+1
* | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | changelogRichard van der Hoff2018-08-071-0/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | changelogRichard van der Hoff2018-08-061-0/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u...Neil Johnson2018-08-083-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-081-0/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | changelogRichard van der Hoff2018-08-071-0/+1
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-031-0/+1
| * | | | | | | | Merge pull request #3644 from matrix-org/michaelkaye/refactor_docker_location...Michael Kaye2018-08-031-0/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Add news entryMichael Kaye2018-08-021-0/+1
* | | | | | | | | Ability to whitelist specific threepids against monthly active user limitingNeil Johnson2018-08-081-0/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Add ability to limit number of monthly active users on the serverNeil Johnson2018-08-031-0/+1
|/ / / / / / /
* / / / / / / newsfragmentMichael Kaye2018-08-021-0/+1
|/ / / / / /
* | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-021-0/+1
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-08-011-0/+1
* | | | | | | Merge pull request #3638 from matrix-org/rav/refactor_federation_client_excep...Richard van der Hoff2018-08-021-0/+1
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2018-08-011-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-021-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_...Erik Johnston2018-07-309-0/+9
| |\ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2018-07-271-0/+1
* | | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-011-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | improve clarityNeil Johnson2018-08-011-1/+1
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-016-0/+6
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | mau limtsNeil Johnson2018-07-311-0/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-foundRichard van der Hoff2018-08-011-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Update 2952.bugfixRichard van der Hoff2018-08-011-1/+1
| * | | | | | | | | return NotFoundError if room not foundSerban Constantin2018-07-311-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-021-0/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3543 from bebehei/dockerJan Christian Grünhage2018-08-011-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [Docker] Use sorted multiline package listsBenedikt Heine2018-07-191-0/+1
* | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layerRichard van der Hoff2018-08-011-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | changelogRichard van der Hoff2018-07-311-0/+1
* | | | | | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decoratorRichard van der Hoff2018-08-011-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-271-0/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 06:42:09 +0000