summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ | | | | | | guest users should not be part of mau total
| * | towncrierNeil Johnson2018-09-051-0/+1
| | |
* | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edusAmber Brown2018-09-071-0/+1
|\ \ \ | | | | | | | | Limit the number of PDUs/EDUs per fedreation transaction
| * | | 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
|\ \ \ \ | | | | | | | | | | Only start postgres instance for postgres tests on Travis CI
| * | | | NewsfileErik Johnston2018-09-061-0/+1
| |/ / /
* | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_idAmber Brown2018-09-071-0/+1
|\ \ \ \ | | | | | | | | | | Remove conn_id from repl prometheus metrics
| * | | | NewsfileErik Johnston2018-09-031-0/+1
| | | | |
* | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_stateAmber Brown2018-09-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | User iter* during sync state calculations
| * | | | | NewsfileErik Johnston2018-09-051-0/+1
| | | | | |
* | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_depAmber Brown2018-09-071-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | bump dep on pyopenssl to 16.x
| * | | | | 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
|\ \ \ \ | | | | | | | | | | Implement 'event_format' filter param in /sync
| * | | | 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
|\ \ \ | |/ / |/| | improve human readable error messages
| * | 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
|\ \ | | | | | | Remove unnecessary resolve_events_with_state_map
| * | 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
|\ \ | | | | | | Make sure that we close db connections opened during init
| * | changelogRichard van der Hoff2018-08-281-0/+1
| | |
* | | changelogKrombel2018-08-292-1/+1
| | |
* | | fix #3445Krombel2018-08-291-0/+1
| | | | | | | | | | | | | | | itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3] but SortedDict only implements d.values()
* | | 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
|/ / | | | | don't return non-LL-member state in incremental sync state blocks
* | 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
|\ \ | | | | | | Allow federation_domain_whitelist to be emtpy list
| * | NewsfileErik Johnston2018-08-241-0/+1
| | |
* | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticseErik Johnston2018-08-241-0/+1
|\ \ \ | | | | | | | | Fix bug where we broke sync when using limit_usage_by_mau
| * | | NewsfileErik Johnston2018-08-241-0/+1
| |/ /
* | | Merge pull request #3751 from matrix-org/rav/twisted_17Richard van der Hoff2018-08-241-0/+1
|\ \ \ | |/ / |/| | Pin to twisted 17.1 or later
| * | 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
|\ \ | | | | | | Reference that the federation_reader needs the HTTP replication port set
| * | Create 3734.miscTravis Ralston2018-08-211-0/+1
| | |
* | | NewsfileErik Johnston2018-08-231-0/+1
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-2240-33/+7
|\ \ \ | | |/ | |/| | | | neilj/server_notices_on_blocking
| * | 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
| |\ \ \ | | | | | | | | | | Allow guests to use /rooms/:roomId/event/:eventId
| | * | | 3724.featureWill Hunt2018-08-201-0/+1
| | | | |
| * | | | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-221-0/+1
| |\ \ \ \ | | | | | | | | | | | | Allow profile updates to happen on workers
| | * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-1783-54/+25
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | erikj/split_profiles
| | * | | | | NewsfileErik Johnston2018-08-091-0/+1
| | | | | | |
| * | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-221-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor state module to support multiple room versions
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-2033-0/+33
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_state_handler
| | * | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | | | | | | | |
| * | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spellingRichard van der Hoff2018-08-221-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | limt -> limit
| | * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits the state_group_cache in two. One half contains normal state events; the other contains member events. The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache. This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching. Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow. Hopefully fixes https://github.com/matrix-org/synapse/issues/3720.
| * | | | | | | | | Merge tag 'v0.33.3rc2' into developRichard van der Hoff2018-08-2142-42/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723))
| | * | | | | | | | 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
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't log exceptions when failing to fetch server keys
| | * | | | | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix logging bug in EDU handling over replication
| | * | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Logcontexts for replication command handlers
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix logcontexts for running pushers
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use a producer to stream back responses
| | * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor request logging code
| | * | | | | | | | changelogRichard van der Hoff2018-08-151-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-171-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | | | 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 ↵Neil Johnson2018-08-173-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | | | Merge pull request #3708 from ↵Neil Johnson2018-08-171-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neilj/resource_Limit_block_event_creation Neilj/resource limit block event creation
| | * | | | | | | | | 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 ↵Neil Johnson2018-08-162-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | 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 ↵Neil Johnson2018-08-161-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-161-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-152-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-151-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix Mau off by one errors
| | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were removed for the 0.33.2 release, but were incorrectly re-added in
| * | | | | | | | 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 ↵Neil Johnson2018-08-1515-0/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-151-0/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Move more federation APIs to workers
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-1573-54/+15
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation
| | * | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-151-0/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | support admin_email config and pass through into blocking errors,
| | * | | | | | remove changelog referencing another PRNeil Johnson2018-08-151-1/+0
| | | | | | | |
| | * | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵Neil Johnson2018-08-151-0/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email
| | | * | | | | | 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
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | combine mau metrics into one group
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-142-0/+2
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | neilj/change_prometheus_mau_metric_name
| | * | | | | | | | 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 servers
| | * | | | | | | Don't fail requests to unbind 3pids for non supporting ID serversErik Johnston2018-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661
| * | | | | | | | Fix missing yield in ↵Neil Johnson2018-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse.storage.monthly_active_users.initialise_reserved_users
| * | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-141-0/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | Block ability to read via sync if mau limit exceeded
| * | | | | | | | Dockerised sytest (#3660)Amber Brown2018-08-141-0/+1
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into ↵Amber Brown2018-08-144-0/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_reap_users_in_postgres
| | * | | | | | | | 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.8
| | | * | | | | | | 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 Google
| | | * | | | | | Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script recaptcha_ajax.js contains minified non-free code which we probably cannot redistribute. Since it talks to Google servers anyway, it is better to just download it from Google directly instead of shipping it. This fixes #1932.
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Blackify the tests
| | * | | | | | | 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
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | send SNI for federation requests
| | * | | | | | Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-2750-7/+37
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into ↵Jeroen2018-07-1412-0/+7
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py
| | * \ \ \ \ \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-092-0/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py
| | * | | | | | | | | 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 ↵Neil Johnson2018-08-091-0/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | messages
* | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-091-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Flag to disable HS without disabling federation
| * \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints
| * | | | | | | | | | Fixup wording and remove dead codeErik Johnston2018-08-091-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-0312-0/+12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | more metrics for the federation and appservice senders
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | Support for room versioning
| * | | | | | | | | | changelogRichard van der Hoff2018-08-061-0/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-083-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | neilj/reserved_users
| * | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-081-0/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | API for monthly_active_users table
| * | | | | | | | | 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 ↵Michael Kaye2018-08-031-0/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/michaelkaye/refactor_docker_locations_v2 Refactor Dockerfile location
| | * | | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clean up handling of errors from outbound requests
| * | | | | | changelogRichard van der Hoff2018-08-011-0/+1
| | | | | | |
* | | | | | | Merge pull request #3638 from ↵Richard van der Hoff2018-08-021-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/refactor_federation_client_exception_handling Factor out exception handling in federation_client
| * | | | | | | changelogRichard van der Hoff2018-08-011-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-021-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Split out DB writes in federation handler
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-07-309-0/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_fed_store
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Initial impl of capping MAU
| * | | | | | | | | improve clarityNeil Johnson2018-08-011-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-016-0/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | return 404 if room not found
| * | | | | | | | | Update 2952.bugfixRichard van der Hoff2018-08-011-1/+1
| | | | | | | | | |
| * | | | | | | | | return NotFoundError if room not foundSerban Constantin2018-07-311-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the Client-Server API[0] we should return `M_NOT_FOUND` if the room isn't found instead of generic SynapseError. This ensures that /directory/list API returns 404 for room not found instead of 400. [0]: https://matrix.org/docs/spec/client_server/unstable.html#get-matrix-client-r0-directory-list-room-roomid Signed-off-by: Serban Constantin <serban.constantin@gmail.com>
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improvements for Docker usage
| * | | | | | | | [Docker] Use sorted multiline package listsBenedikt Heine2018-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches docker best practices. Signed-off-by: Benedikt Heine <bebe@bebehei.de>
* | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layerRichard van der Hoff2018-08-011-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | rename replication_layer to federation_client
| * | | | | | | | | 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 decorator
| * | | | | | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it was complicated and annoyed me. I suspect this will be more efficient too.
* | | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failuresTravis Ralston2018-07-311-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Remove pdu_failures from transactions
| * | | | | | | | | Remove pdu_failures from transactionsTravis Ralston2018-07-301-0/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | The field is never read from, and all the opportunities given to populate it are not utilized. It should be very safe to remove this.
* | | | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchyRichard van der Hoff2018-07-311-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Make EventStore inherit from EventFederationStore
| * | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| | | | | | | | |
* | | | | | | | | Only import secrets when availableKrombel2018-07-301-0/+1
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secrets got introduced in python 3.6 so this class is not available in 3.5 and before. This now checks for the current running version and only tries using secrets if the version is 3.6 or above Signed-Off-By: Matthias Kesler <krombel@krombel.de>
* | | | | | | | make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-271-0/+1
| |/ / / / / / |/| | | | | | | | | | | | | make /context lazyload & filter aware.
* | | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pidRichard van der Hoff2018-07-271-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | if inviter_display_name == ""||None then default to inviter MXID
| * | | | | | add changelog entry for PR#3391Michael Telatynski2018-07-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leaveRichard van der Hoff2018-07-261-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update the send_leave path to be an event_id
| * | | | | | | Create 3616.miscTravis Ralston2018-07-261-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_contentRichard van der Hoff2018-07-261-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Stop populating events.content
| * | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Deduplicate redundant lazy-loaded members (#3331)Matthew Hodgson2018-07-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * attempt at deduplicating lazy-loaded members as per the proposal; we can deduplicate redundant lazy-loaded members which are sent in the same sync sequence. we do this heuristically rather than requiring the client to somehow tell us which members it has chosen to cache, by instead caching the last N members sent to a client, and not sending them again. For now we hardcode N to 100. Each cache for a given (user,device) tuple is in turn cached for up to X minutes (to avoid the caches building up). For now we hardcode X to 30. * add include_redundant_members filter option & make it work * remove stale todo * add tests for _get_some_state_from_cache * incorporate review
* | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-261-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove some redundant joins on event_edges.room_id
| * | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| |/ / / / / /
* / / / / / / Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-261-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call.
* | | | | | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-261-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement the lazy_load_members room state filter parameter
| * \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2510-0/+10
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-241-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-243-0/+3
| |\ \ \ \ \ \ \
| * | | | | | | | changelogMatthew Hodgson2018-07-231-0/+1
| | | | | | | | |
* | | | | | | | | Create 3609.miscTravis Ralston2018-07-251-0/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3603 from matrix-org/erikj/handle_outliersErik Johnston2018-07-251-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correctly handle outliers during persist events
| * | | | | | | | NewsfileErik Johnston2018-07-251-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_moreRichard van der Hoff2018-07-251-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix another logcontext leak in _persist_events
| * | | | | | | | | Fix another logcontext leak in _persist_eventsRichard van der Hoff2018-07-251-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to run the errback in the sentinel context to avoid losing our own context. Also: add logging to runInteraction to help identify where "Starting db connection from sentinel context" warnings are coming from
* | | | | | | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_errorRichard van der Hoff2018-07-251-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix occasional 'tuple index out of range' error
| * | | | | | | | | Fix occasional 'tuple index out of range' errorRichard van der Hoff2018-07-251-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in _delete_existing_rows_txn which was introduced in #3435 (though it's been on matrix-org-hotfixes for *years*). This code is only called when there is some sort of conflict the first time we try to persist an event, so it only happens rarely. Still, the exceptions are annoying.
* | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cacheRichard van der Hoff2018-07-251-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix updating of cached remote profiles
| * | | | | | | | | changelogRichard van der Hoff2018-07-251-0/+1
| |/ / / / / / / /
* / / / / / / / / ChangelogRichard van der Hoff2018-07-251-0/+1
|/ / / / / / / /
* | | | | | | | Move newsfileErik Johnston2018-07-241-0/+0
| | | | | | | |
* | | | | | | | NewsfileErik Johnston2018-07-241-0/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #3595 from matrix-org/erikj/use_deltasErik Johnston2018-07-241-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use deltas to calculate current state deltas
| * | | | | | | NewsfileErik Johnston2018-07-241-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3587 from matrix-org/rav/better_exception_loggingRichard van der Hoff2018-07-241-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve logging for exceptions when handling PDUs
| * | | | | | | changelogRichard van der Hoff2018-07-231-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groupsRichard van der Hoff2018-07-241-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes and optimisations for resolve_state_groups
| * | | | | | | newsfileRichard van der Hoff2018-07-231-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-241-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Remove redundant checks on room forgottenness
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-244-0/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-237-0/+5
| |\ \ \ \ \ \
| * | | | | | | Remove redundant checks on room forgottennessRichard van der Hoff2018-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3550
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-07-243-0/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | erikj/speed_up_calculate_state_delta
| * | | | | | | Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-242-0/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #3555 from matrix-org/erikj/client_apis_moveErik Johnston2018-07-241-0/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make client_reader support some more read only APIs
| | | * \ \ \ \ \ \ Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-245-0/+4
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-07-2329-10/+10
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/client_apis_move
| | | * | | | | | | | NewsfileErik Johnston2018-07-181-0/+1
| | | | | | | | | | |
| | * | | | | | | | | changelogRichard van der Hoff2018-07-241-0/+1
| | | |_|/ / / / / / | | |/| | | | | | |
| * / | | | | | | | ChangelogRichard van der Hoff2018-07-241-0/+1
| |/ / / / / / / /
* / / / / / / / / NewsfileErik Johnston2018-07-241-0/+1
|/ / / / / / / /
* | | | / / / / NewsfileErik Johnston2018-07-231-0/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| | | | | | |
* | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| | | | | | |
* | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| | | | | | |
* | | | | | | NewsfileErik Johnston2018-07-231-0/+0
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'develop' into matthew/sync_deleted_devicesMatthew Hodgson2018-07-2317-2/+11
|\ \ \ \ \ \