summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3788 from matrix-org/erikj/remove_conn_idAmber Brown2018-09-072-12/+13
|\ | | | | Remove conn_id from repl prometheus metrics
| * Remove conn_idErik Johnston2018-09-041-2/+2
| |
| * NewsfileErik Johnston2018-09-031-0/+1
| |
| * Remove conn_id from repl prometheus metricsErik Johnston2018-09-031-10/+10
| | | | | | | | | | `conn_id` gets set to a random string, and so we end up filling up prometheus with tonnes of data series, which is bad.
* | Merge pull request #3795 from matrix-org/erikj/faster_sync_stateAmber Brown2018-09-072-8/+9
|\ \ | | | | | | User iter* during sync state calculations
| * | NewsfileErik Johnston2018-09-051-0/+1
| | |
| * | User iter* during sync state calculationsErik Johnston2018-09-051-8/+8
| | |
* | | Merge pull request #3804 from matrix-org/rav/fix_openssl_depAmber Brown2018-09-072-2/+3
|\ \ \ | | | | | | | | bump dep on pyopenssl to 16.x
| * | | changelogRichard van der Hoff2018-09-061-0/+1
| | | |
| * | | bump dep on pyopenssl to 16.xRichard van der Hoff2018-09-061-2/+2
| | | |
* | | | Port handlers/ to Python 3 (#3803)Amber Brown2018-09-078-19/+24
| | | |
* | | | Merge branch 'master' into developRichard van der Hoff2018-09-069-47/+157
|\ \ \ \ | |/ / / |/| | |
| * | | Merge tag 'v0.33.3.1'Richard van der Hoff2018-09-069-47/+157
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.3.1 (2018-09-06) ============================= SECURITY FIXES -------------- - Fix an issue where event signatures were not always correctly validated ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) - Fix an issue where server_acls could be circumvented for incoming events ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) Internal Changes ---------------- - Unignore synctl in .dockerignore to fix docker builds ([\#3802](https://github.com/matrix-org/synapse/issues/3802))
| | * | | prepare v0.33.3.1 v0.33.3.1 github/release-v0.33.3.1 release-v0.33.3.1Richard van der Hoff2018-09-063-2/+15
| | | | |
| | * | | Create 3802.miscJan Christian Grünhage2018-09-061-0/+1
| | | | |
| | * | | remove synctl from .dockerignoreJan Christian Grünhage2018-09-061-1/+0
| | | | |
| | * | | Fix origin handling for pushed transactionsRichard van der Hoff2018-09-055-29/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Use the actual origin for push transactions, rather than whatever the remote server claimed.
| | * | | Check that signatures on events are validRichard van der Hoff2018-09-051-16/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should check that both the sender's server, and the server which created the event_id (which may be different from whatever the remote server has told us the origin is), have signed the event.
* | | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filterRichard van der Hoff2018-09-053-13/+40
|\ \ \ \ \ | | | | | | | | | | | | Implement 'event_format' filter param in /sync
| * | | | | changelogRichard van der Hoff2018-09-041-0/+1
| | | | | |
| * | | | | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-042-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been specced and part-implemented; let's implement it for /sync (but no other endpoints yet :/).
* | | | | | Port http/ to Python 3 (#3771)Amber Brown2018-09-068-186/+134
| |_|_|/ / |/| | | |
* | | | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5Neil Johnson2018-09-043-7/+22
|\ \ \ \ \ | |/ / / / |/| | | | improve human readable error messages
| * | | | towncrierNeil Johnson2018-09-041-0/+1
| | | | |
| * | | | improve human readable error messageNeil Johnson2018-09-041-1/+2
| | | | |
| * | | | improve human readable error messagesNeil Johnson2018-09-042-7/+20
| | | | |
* | | | | Fix tests on postgresql (#3740)Amber Brown2018-09-0418-341/+356
| |_|_|/ |/| | |
* | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_funcErik Johnston2018-09-034-57/+8
|\ \ \ \ | | | | | | | | | | Remove unnecessary resolve_events_with_state_map
| * | | | NewsfileErik Johnston2018-09-031-0/+1
| | | | |
| * | | | Remove unnecessary resolve_events_with_state_mapErik Johnston2018-08-223-57/+7
| | | | | | | | | | | | | | | | | | | | | | | | | We only ever used the synchronous resolve_events_with_state_map in one place, which is trivial to replace with the async version.
* | | | | Merge pull request #3378 from NickEckardt/developAmber Brown2018-09-032-5/+1
|\ \ \ \ \ | | | | | | | | | | | | matrix-synapse-auto-deploy is no longer maintained.
| * | | | | Create 3378.miscAmber Brown2018-09-031-0/+1
| | | | | |
| * | | | | Merge branch 'develop' into developAmber Brown2018-09-03441-11570/+24237
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3777 from matrix-org/neilj/fix_register_user_registrationNeil Johnson2018-08-319-5/+78
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | fix bug where preserved threepid user comes to sign up and server is …
| * | | | | assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
| | | | | |
| * | | | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-316-21/+41
| | | | | |
| * | | | | fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
| | | | | |
| * | | | | typoNeil Johnson2018-08-311-1/+1
| | | | | |
| * | | | | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-314-6/+24
| | | | | |
| * | | | | news fragemntNeil Johnson2018-08-311-0/+1
| | | | | |
| * | | | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-315-3/+38
|/ / / / /
* | | | | Port storage/ to Python 3 (#3725)Amber Brown2018-08-3117-36/+208
| | | | |
* | | | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_initRichard van der Hoff2018-08-3016-54/+41
|\ \ \ \ \ | | | | | | | | | | | | Make sure that we close db connections opened during init
| * | | | | Fix up testsRichard van der Hoff2018-08-283-6/+10
| | | | | |
| * | | | | use abc.abstractpropertyRichard van der Hoff2018-08-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | This gives clearer messages when someone gets it wrong
| * | | | | changelogRichard van der Hoff2018-08-281-0/+1
| | | | | |
| * | | | | Make sure that we close db connections opened during initRichard van der Hoff2018-08-2812-48/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should explicitly close any db connections we open, because failing to do so can block other transactions as per https://github.com/matrix-org/synapse/issues/3682. Let's also try to factor out some of the boilerplate by having server classes define their datastore class rather than duplicating the whole of `setup`.
* | | | | | Merge pull request #3768 from krombel/fix_3445Erik Johnston2018-08-292-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix #3445 - do not use itervalues() on SortedDict()
| * | | | | | changelogKrombel2018-08-292-1/+1
| | | | | | |
| * | | | | | fix #3445Krombel2018-08-292-2/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 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-292-3/+5
| | | | | |
* | | | | | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-282-1/+9
|/ / / / / | | | | | | | | | | don't return non-LL-member state in incremental sync state blocks
* | | | | Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3Erik Johnston2018-08-248-13/+14
|\ \ \ \ \ | | | | | | | | | | | | Change admin_uri to admin_contact in config and errors
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-243-4/+5
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_noticesErik Johnston2018-08-243-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix checking if service notice room is already tagged
| * | | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | | |
| * | | | | | Fix checking if service notice room is already taggedErik Johnston2018-08-242-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | This manifested in synapse repeatedly setting the tag for the room
| * | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | |
| * | | | | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-247-13/+13
|/ / / / /
* | | | | Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags hhs-2Erik Johnston2018-08-243-4/+16
|\ \ \ \ \ | | | | | | | | | | | | Fix up tagging server notice rooms.
| * | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | |
| * | | | | Ensure we wake up /sync when we add tag to notice roomErik Johnston2018-08-242-2/+13
| | | | | |
| * | | | | Make content of tag an empty object rather than nullErik Johnston2018-08-242-2/+2
|/ / / / /
* | | | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1Erik Johnston2018-08-242-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Allow federation_domain_whitelist to be emtpy list
| * | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | |
| * | | | | Fix bug when federation_domain_whitelist is an emtpy listErik Johnston2018-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outbound federation were incorrectly allowed when the config option was set to an empty list
* | | | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticseErik Johnston2018-08-242-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix bug where we broke sync when using limit_usage_by_mau
| * | | | | | NewsfileErik Johnston2018-08-241-0/+1
| | | | | | |
| * | | | | | Fix bug where we broke sync when using limit_usage_by_mauErik Johnston2018-08-241-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | We assumed that we always had service notices configured, but that is not always true
* | | | | | Merge pull request #3751 from matrix-org/rav/twisted_17Richard van der Hoff2018-08-242-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Pin to twisted 17.1 or later
| * | | | | changelogRichard van der Hoff2018-08-241-0/+1
| | | | | |
| * | | | | Pin to twisted 17.1 or laterRichard van der Hoff2018-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/3741.
* | | | | | Merge pull request #3749 from matrix-org/erikj/add_trial_usersErik Johnston2018-08-248-5/+272
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Implement trial users
| * | | | | NewsfileErik Johnston2018-08-231-0/+1
| | | | | |
| * | | | | Unit testsErik Johnston2018-08-232-3/+227
| | | | | |
| * | | | | Implement trail usersErik Johnston2018-08-235-2/+44
|/ / / / /
* | | | | Merge pull request #3747 from matrix-org/erikj/fix_multiple_sends_noticeErik Johnston2018-08-233-1/+72
|\ \ \ \ \ | | | | | | | | | | | | Fix bug where we resent "limit exceeded" server notices
| * | | | | NewsfileErik Johnston2018-08-231-0/+1
| | | | | |
| * | | | | Fix bug where we resent "limit exceeded" server noticesErik Johnston2018-08-232-1/+71
|/ / / / / | | | | | | | | | | | | | | | This was due to a bug where we mutated a cached event's contents
* | | | | Merge pull request #3734 from matrix-org/travis/worker-docsTravis Ralston2018-08-232-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Reference that the federation_reader needs the HTTP replication port set
| * | | | | Create 3734.miscTravis Ralston2018-08-211-0/+1
| | | | | |
| * | | | | Reference that the federation_reader needs the HTTP replication port setTravis Ralston2018-08-211-1/+1
| | | | | |
* | | | | | Merge pull request #3746 from matrix-org/erikj/mau_fixupsErik Johnston2018-08-233-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix MAU invalidation due to missing yield
| * | | | | | NewsfileErik Johnston2018-08-231-0/+1
| | | | | | |
| * | | | | | Actually run the testsErik Johnston2018-08-231-0/+0
| | | | | | |
| * | | | | | Add missing yieldErik Johnston2018-08-231-1/+2
|/ / / / / /
* | | | | | Merge pull request #3680 from matrix-org/neilj/server_notices_on_blockingErik Johnston2018-08-2210-32/+408
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | server notices on resource limit blocking
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-22116-764/+1624
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | neilj/server_notices_on_blocking
* | | | | | Merge branch 'master' into developRichard van der Hoff2018-08-223-4/+12
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Use recaptcha_ajax.js directly from GoogleRichard van der Hoff2018-08-222-196/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was originally done in commit c75b71a397d91c013a65a7f57d2c13199cf4c204, but got reverted on this branch due to the PR (#3677) being based on the wrong branch. We're ready to merge this to master now, so let's make it match release-v0.33.3.
| * | | | | Merge tag 'v0.33.3'Richard van der Hoff2018-08-22200-3529/+5653
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features -------- - Add support for the SNI extension to federation TLS connections. Thanks to @vojeroen! ([\#3439](https://github.com/matrix-org/synapse/issues/3439)) - Add /_media/r0/config ([\#3184](https://github.com/matrix-org/synapse/issues/3184)) - speed up /members API and add `at` and `membership` params as per MSC1227 ([\#3568](https://github.com/matrix-org/synapse/issues/3568)) - implement `summary` block in /sync response as per MSC688 ([\#3574](https://github.com/matrix-org/synapse/issues/3574)) - Add lazy-loading support to /messages as per MSC1227 ([\#3589](https://github.com/matrix-org/synapse/issues/3589)) - Add ability to limit number of monthly active users on the server ([\#3633](https://github.com/matrix-org/synapse/issues/3633)) - Support more federation endpoints on workers ([\#3653](https://github.com/matrix-org/synapse/issues/3653)) - Basic support for room versioning ([\#3654](https://github.com/matrix-org/synapse/issues/3654)) - Ability to disable client/server Synapse via conf toggle ([\#3655](https://github.com/matrix-org/synapse/issues/3655)) - Ability to whitelist specific threepids against monthly active user limiting ([\#3662](https://github.com/matrix-org/synapse/issues/3662)) - Add some metrics for the appservice and federation event sending loops ([\#3664](https://github.com/matrix-org/synapse/issues/3664)) - Where server is disabled, block ability for locked out users to read new messages ([\#3670](https://github.com/matrix-org/synapse/issues/3670)) - set admin uri via config, to be used in error messages where the user should contact the administrator ([\#3687](https://github.com/matrix-org/synapse/issues/3687)) - Synapse's presence functionality can now be disabled with the "use_presence" configuration option. ([\#3694](https://github.com/matrix-org/synapse/issues/3694)) - For resource limit blocked users, prevent writing into rooms ([\#3708](https://github.com/matrix-org/synapse/issues/3708)) Bugfixes -------- - Fix occasional glitches in the synapse_event_persisted_position metric ([\#3658](https://github.com/matrix-org/synapse/issues/3658)) - Fix bug on deleting 3pid when using identity servers that don't support unbind API ([\#3661](https://github.com/matrix-org/synapse/issues/3661)) - Make the tests pass on Twisted < 18.7.0 ([\#3676](https://github.com/matrix-org/synapse/issues/3676)) - Don’t ship recaptcha_ajax.js, use it directly from Google ([\#3677](https://github.com/matrix-org/synapse/issues/3677)) - Fixes test_reap_monthly_active_users so it passes under postgres ([\#3681](https://github.com/matrix-org/synapse/issues/3681)) - Fix mau blocking calulation bug on login ([\#3689](https://github.com/matrix-org/synapse/issues/3689)) - Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users ([\#3692](https://github.com/matrix-org/synapse/issues/3692)) - Improve HTTP request logging to include all requests ([\#3700](https://github.com/matrix-org/synapse/issues/3700)) - Avoid timing out requests while we are streaming back the response ([\#3701](https://github.com/matrix-org/synapse/issues/3701)) - Support more federation endpoints on workers ([\#3705](https://github.com/matrix-org/synapse/issues/3705), [\#3713](https://github.com/matrix-org/synapse/issues/3713)) - Fix "Starting db txn 'get_all_updated_receipts' from sentinel context" warning ([\#3710](https://github.com/matrix-org/synapse/issues/3710)) - Fix bug where `state_cache` cache factor ignored environment variables ([\#3719](https://github.com/matrix-org/synapse/issues/3719)) - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723)) - Fix bug introduced in v0.33.3rc1 which made the ToS give a 500 error ([\#3732](https://github.com/matrix-org/synapse/issues/3732)) Deprecations and Removals ------------------------- - The Shared-Secret registration method of the legacy v1/register REST endpoint has been removed. For a replacement, please see [the admin/register API documentation](https://github.com/matrix-org/synapse/blob/master/docs/admin_api/register_api.rst). ([\#3703](https://github.com/matrix-org/synapse/issues/3703)) Internal Changes ---------------- - The test suite now can run under PostgreSQL. ([\#3423](https://github.com/matrix-org/synapse/issues/3423)) - Refactor HTTP replication endpoints to reduce code duplication ([\#3632](https://github.com/matrix-org/synapse/issues/3632)) - Tests now correctly execute on Python 3. ([\#3647](https://github.com/matrix-org/synapse/issues/3647)) - Sytests can now be run inside a Docker container. ([\#3660](https://github.com/matrix-org/synapse/issues/3660)) - Port over enough to Python 3 to allow the sytests to start. ([\#3668](https://github.com/matrix-org/synapse/issues/3668)) - Update docker base image from alpine 3.7 to 3.8. ([\#3669](https://github.com/matrix-org/synapse/issues/3669)) - Rename synapse.util.async to synapse.util.async_helpers to mitigate async becoming a keyword on Python 3.7. ([\#3678](https://github.com/matrix-org/synapse/issues/3678)) - Synapse's tests are now formatted with the black autoformatter. ([\#3679](https://github.com/matrix-org/synapse/issues/3679)) - Implemented a new testing base class to reduce test boilerplate. ([\#3684](https://github.com/matrix-org/synapse/issues/3684)) - Rename MAU prometheus metrics ([\#3690](https://github.com/matrix-org/synapse/issues/3690)) - add new error type ResourceLimit ([\#3707](https://github.com/matrix-org/synapse/issues/3707)) - Logcontexts for replication command handlers ([\#3709](https://github.com/matrix-org/synapse/issues/3709)) - Update admin register API documentation to reference a real user ID. ([\#3712](https://github.com/matrix-org/synapse/issues/3712))
| | * | | | changelog for 0.33.3 v0.33.3 github/release-v0.33.3 release-v0.33.3Richard van der Hoff2018-08-222-1/+9
| | | | | |
| | * | | | bump version to 0.33.3Richard van der Hoff2018-08-221-1/+1
| | | | | |
| | * | | | Update attributions and PR links in changelogRichard van der Hoff2018-08-221-2/+2
| | | | | |
| * | | | | Merge pull request #3685 from matrix-org/revert-3677-masterRichard van der Hoff2018-08-133-2/+196
| |\ \ \ \ \ | | | | | | | | | | | | | | Revert "Use recaptcha_ajax.js directly from Google"
| | * | | | | Revert "Use recaptcha_ajax.js directly from Google"Richard van der Hoff2018-08-133-2/+196
| |/ / / / /
| * | | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-133-196/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Use recaptcha_ajax.js directly from Google
* | \ \ \ \ \ Merge pull request #3724 from Half-Shot/hs/guest-fetch-eventErik Johnston2018-08-222-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow guests to use /rooms/:roomId/event/:eventId
| * | | | | | | 3724.featureWill Hunt2018-08-201-0/+1
| | | | | | | |
| * | | | | | | Allow guests to access /rooms/:roomId/event/:eventIdWill Hunt2018-08-201-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-229-44/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow profile updates to happen on workers
| * | | | | | | | Rename WorkerProfileHandler to BaseProfileHandlerErik Johnston2018-08-222-5/+12
| | | | | | | | |
| * | | | | | | | Add assert to ensure handler is only run on masterErik Johnston2018-08-221-0/+2
| | | | | | | | |
| * | | | | | | | Remove redundant varsErik Johnston2018-08-221-3/+0
| | | | | | | | |
| * | | | | | | | Add some fixmesErik Johnston2018-08-172-0/+6
| | | | | | | | |
| * | | | | | | | Call UserDirectoryHandler methods directlyErik Johnston2018-08-174-104/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the user directory handling is fairly racey as a bunch of stuff assumes that the processing happens on master, which it doesn't when there is a synapse.app.user_dir worker. So lets just call the function directly until we actually get round to fixing it, since it doesn't make the situation any worse.
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-17244-2980/+3681
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_profiles
| * | | | | | | | | Split ProfileHandler into master and workerErik Johnston2018-08-173-11/+21
| | | | | | | | | |
| * | | | | | | | | Remote profile cache should remain in master workerErik Johnston2018-08-171-4/+2
| | | | | | | | | |
| * | | | | | | | | DocstringsErik Johnston2018-08-091-1/+11
| | | | | | | | | |
| * | | | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-0967-408/+1156
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_profiles
| * | | | | | | | | | Update workers.rst with new pathsErik Johnston2018-08-071-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Allow ratelimiting on workersErik Johnston2018-08-071-29/+29
| | | | | | | | | | |
| * | | | | | | | | | Allow profile changes to happen on workersErik Johnston2018-08-075-8/+106
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-2213-277/+437
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor state module to support multiple room versions
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-20208-3244/+4271
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_state_handler
| * | | | | | | | | | | | Remove redundant room_version checksErik Johnston2018-08-202-15/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Revert spurious changeErik Johnston2018-08-201-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix testsErik Johnston2018-08-096-5/+46
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add fast path in state res for zero prev eventsErik Johnston2018-08-091-1/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Choose state algorithm based on room versionErik Johnston2018-08-094-16/+105
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add constants for room versionsErik Johnston2018-08-091-2/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Refactor state moduleErik Johnston2018-08-092-296/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We split out the actual state resolution algorithm to prepare for having multiple versions.
* | | | | | | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spellingRichard van der Hoff2018-08-222-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | limt -> limit
| * | | | | | | | | | | | | Create 3735.miscTravis Ralston2018-08-211-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | limt -> limitTravis Ralston2018-07-311-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.3' into developRichard van der Hoff2018-08-222-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3732 from matrix-org/rav/fix_gdpr_consentRichard van der Hoff2018-08-222-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error from /consent form
| | * | | | | | | | | | | | changelogRichard van der Hoff2018-08-211-0/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | fix another consent encoding failRichard van der Hoff2018-08-211-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix 500 error from /consent formRichard van der Hoff2018-08-211-2/+11
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3731
* | | | | | | | | | | | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-223-28/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2146-46/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-213-2/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3723 from matrix-org/rav/fix_logcontext_disasterAmber Brown2018-08-213-3/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix exceptions when a connection is closed before we read the headers
| | * | | | | | | | | | | | changelogRichard van der Hoff2018-08-201-0/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fix exceptions when a connection is closed before we read the headersRichard van der Hoff2018-08-202-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bugs introduced in #3700, by making sure that we behave sanely when an incoming connection is closed before the headers are read.
| | * | | | | | | | | | | | Robustness fix for logcontext filterRichard van der Hoff2018-08-201-1/+7
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the logcontext filter not explode if it somehow ends up with a logcontext of None, since that infinite-loops the whole logging system.
| * | | | | | | | | | | | changelog v0.33.3rc1Amber Brown2018-08-2143-42/+64
| | | | | | | | | | | | |
| * | | | | | | | | | | | versionAmber Brown2018-08-211-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keysErik Johnston2018-08-213-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Don't log exceptions when failing to fetch server keys
| * | | | | | | | | | | | Log more detail when we fail to authenticate requestErik Johnston2018-08-211-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | NewsfileErik Johnston2018-08-211-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Don't log exceptions when failing to fetch server keysErik Johnston2018-08-212-4/+8
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not being able to resolve or connect to remote servers is an expected error, so we shouldn't log at ERROR with stacktraces.
* | | | | | | | | | | | Merge pull request #3722 from matrix-org/erikj/bg_process_iterationErik Johnston2018-08-213-8/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | LaterGauge needs to call thread safe functions
| * | | | | | | | | | | Fix typoErik Johnston2018-08-211-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | isortErik Johnston2018-08-211-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | NewsfileErik Johnston2018-08-201-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Make the in flight requests metrics thread safeErik Johnston2018-08-201-3/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Make the in flight background process metrics thread safeErik Johnston2018-08-201-5/+20
|/ / / / / / / / / / /
* | | / / / / / / / / Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-2012-40/+91
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3719 from matrix-org/erikj/use_cache_factErik Johnston2018-08-202-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use get_cache_factor_for function for `state_cache`
| * | | | | | | | | | NewsfileErik Johnston2018-08-201-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Use get_cache_factor_for function for `state_cache`Erik Johnston2018-08-201-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the cache factor for `state_cache` to be individually specified in the enviroment
* | | | | | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_loggingErik Johnston2018-08-202-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix logging bug in EDU handling over replication
| * | | | | | | | | | NewsfileErik Johnston2018-08-171-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix logging bug in EDU handling over replicationErik Johnston2018-08-171-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commandsRichard van der Hoff2018-08-179-20/+54
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Logcontexts for replication command handlers
| * | | | | | | | | | | changelogRichard van der Hoff2018-08-171-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Logcontexts for replication command handlersRichard van der Hoff2018-08-178-20/+53
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the handlers for replication commands as background processes. This should improve the visibility in our metrics, and reduce the number of "running db transaction from sentinel context" warnings. Ideally it means converting the things that fire off deferreds into the night into things that actually return a Deferred when they are done. I've made a bit of a stab at this, but it will probably be leaky.
* | | | | | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updatesRichard van der Hoff2018-08-176-21/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix logcontexts for running pushers
| * | | | | | | | | | | changelogRichard van der Hoff2018-08-171-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix logcontexts for running pushersRichard van der Hoff2018-08-175-21/+28
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts.
* | | | | | | | | | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-1817-67/+303
| | | | | | | | | | |
* | | | | | | | | | | Remove v1/register's broken shared secret functionality (#3703)Amber Brown2018-08-182-54/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-179-64/+63
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use a producer to stream back responses
| * | | | | | | | | | | changelogRichard van der Hoff2018-08-151-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix the testsAmber Brown2018-08-157-60/+49
| | | | | | | | | | | |
| * | | | | | | | | | | Use a producer to stream back responsesRichard van der Hoff2018-08-151-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with dumping all of the json response into the Request object at once is that doing so starts the timeout for the next request to be received: so if it takes longer than 60s to stream back the response to the client, the client never gets it. The correct solution is to use a Producer; then the timeout is only started once all of the content is sent over the TCP connection.
* | | | | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producersRichard van der Hoff2018-08-173-92/+180
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor request logging code
| * | | | | | | | | | | | changelogRichard van der Hoff2018-08-151-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Refactor request logging codeRichard van der Hoff2018-08-152-92/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves a bunch of the logic for deciding when to log the receipt and completion of HTTP requests into SynapseRequest, rather than in the request handling wrappers. Advantages of this are: * we get logs for *all* requests (including OPTIONS and HEADs), rather than just those that end up hitting handlers we've remembered to decorate correctly. * when a request handler wires up a Producer (as the media stuff does currently, and as other things will do soon), we log at the point that all of the traffic has been sent to the client.
| | | | | | | | | | | * | Update notice formatErik Johnston2018-08-223-8/+24
| | | | | | | | | | | | |
| | | | | | | | | | | * | rename error codeNeil Johnson2018-08-184-8/+8
| | | | | | | | | | | | |
| | | | | | | | | | | * | special case server_notices_mxidNeil Johnson2018-08-181-0/+6
| | | | | | | | | | | | |
| | | | | | | | | | | * | special case server_notices_mxidNeil Johnson2018-08-182-1/+9
| | | | | | | | | | | | |
| | | | | | | | | | | * | clean up, no functional changesNeil Johnson2018-08-173-56/+64
| | | | | | | | | | | | |
| | | | | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-179-24/+75
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
* | | | | | | | | | | | | Merge pull request #3707 from matrix-org/neilj/limit_exceeded_errorNeil Johnson2018-08-179-24/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | add new error type ResourceLimit
| * | | | | | | | | | | | Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse ↵Neil Johnson2018-08-1712-4/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neilj/limit_exceeded_error
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-1711-4/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | add new error type ResourceLimitNeil Johnson2018-08-161-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | server limits config docsNeil Johnson2018-08-171-0/+26
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | add new error type ResourceLimitNeil Johnson2018-08-168-24/+47
| | | | | | | | | | | | |
| | | | | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-1711-4/+34
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
* | | | | | | | | | | | | Merge pull request #3708 from ↵Neil Johnson2018-08-177-3/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neilj/resource_Limit_block_event_creation Neilj/resource limit block event creation
| * | | | | | | | | | | | | remove errant yieldNeil Johnson2018-08-171-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | For resource limit blocked users, prevent writing into roomsNeil Johnson2018-08-161-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | call reap on start up and fix under reaping bugNeil Johnson2018-08-164-2/+19
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | block event creation and room creation on hitting resource limitsNeil Johnson2018-08-162-1/+9
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3712 from matrix-org/travis/register-admin-docsAmber Brown2018-08-172-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Update the admin register documentation to return a real user ID
| * | | | | | | | | | | | Create 3712.miscTravis Ralston2018-08-171-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update the admin register documentation to return a real user IDTravis Ralston2018-08-171-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Presumably this is the intention anyways. I've also updated the domain part to be something more along the lines of what people might expect.
* | | | | | | | | | | | Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_workerErik Johnston2018-08-162-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Fix inbound federation on reader worker
| * | | | | | | | | | | NewsfileErik Johnston2018-08-161-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix inbound federation on reader workerErik Johnston2018-08-161-0/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inbound federation requires calculating push, which in turn relies on having access to account data.
| | | | | | | | | * | flake8Neil Johnson2018-08-161-3/+2
| | | | | | | | | | |
| | | | | | | | | * | refactor for readability, and reuse caching for setting tagsNeil Johnson2018-08-163-68/+115
| | | | | | | | | | |
| | | | | | | | | * | add room taggingNeil Johnson2018-08-161-9/+5
| | | | | | | | | | |
| | | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-166-3/+98
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
* | | | | | | | | | | Add GET media/v1/config (#3184)Will Hunt2018-08-163-1/+51
| | | | | | | | | | |
* | | | | | | | | | | lazyload aware /messages (#3589)Matthew Hodgson2018-08-163-2/+47
| | | | | | | | | | |
| | | | | | | | | * | check for room state before deciding on actionNeil Johnson2018-08-163-87/+58
| | | | | | | | | | |
| | | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-167-28/+169
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
* | | | | | | | | | | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-166-18/+159
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3686 from matrix-org/rav/changelog_links_to_prsRichard van der Hoff2018-08-151-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Changelog should link to PRs
| * | | | | | | | | | | Changelog should link to PRsRichard van der Hoff2018-08-131-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changelog makes much more sense if it consistently links to PRs, rather than mostly PRs with the occasional issue #.
| | | | | | | | | | * | WIP impl commiting to get feedbackNeil Johnson2018-08-161-6/+74
| | | | | | | | | | | |
| | | | | | | | | | * | fix case where empty string state check is evaulated as FalseNeil Johnson2018-08-161-1/+2
| | | | | | | | | | | |
| | | | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-1510-23/+231
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
* | | | | | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-154-4/+59
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Mau off by one errors
| * | | | | | | | | | | | Fix mau blocking calulation bug on loginNeil Johnson2018-08-151-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-1531-186/+615
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-145-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| * | | | | | | | | | | | | | fix off by 1 errorsNeil Johnson2018-08-142-3/+14
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | support admin_email config and pass through into blocking errors, return ↵Neil Johnson2018-08-142-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases
| * | | | | | | | | | | | | | fix off by 1s on mauNeil Johnson2018-08-143-7/+50
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-141-10/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-148-22/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-147-20/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
* | | | | | | | | | | | | | | | | 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-158-19/+174
| |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-15163-2853/+2949
| | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
* | | | | | | | | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-1516-138/+512
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | Move more federation APIs to workers
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-15217-2760/+2605
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation
| * | | | | | | | | | | | | | | | Use federation handler function rather than duplicateErik Johnston2018-08-152-48/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function.
| * | | | | | | | | | | | | | | | Rename slave TransactionStore to SlaveTransactionStoreErik Johnston2018-08-156-11/+11
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Update docs/workers.rstErik Johnston2018-08-091-0/+13
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move clean_room_for_join to masterErik Johnston2018-08-092-2/+49
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixup doc commentsErik Johnston2018-08-092-0/+28
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-0967-408/+1156
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation
| * | | | | | | | | | | | | | | | Pull in necessary stores in federation_readerErik Johnston2018-08-062-1/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move necessary storage functions to worker classesErik Johnston2018-08-063-98/+100
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import all functions from TransactionStoreErik Johnston2018-08-061-11/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add EDU/query handling over replicationErik Johnston2018-08-064-13/+62
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add replication APIs for persisting federation eventsErik Johnston2018-08-064-10/+290
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-159-30/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | support admin_email config and pass through into blocking errors,
| * | | | | | | | | | | | | | | remove changelog referencing another PRNeil Johnson2018-08-151-1/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | clean up AuthErrorNeil Johnson2018-08-151-7/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵Neil Johnson2018-08-154-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email
| | * | | | | | | | | | | | | | | update error codesNeil Johnson2018-08-151-2/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | update resource limit error codesNeil Johnson2018-08-151-0/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | update error codes for resource limitingNeil Johnson2018-08-152-4/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | update admin email to uriNeil Johnson2018-08-152-2/+2
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-155-11/+11
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-1418-76/+373
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | remove blank lineNeil Johnson2018-08-141-1/+0
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 14:58:13 +0000