summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * Don't assign numeric IDs for empty usernames (#6690)Richard van der Hoff2020-01-131-0/+1
| * Merge pull request #6689 from matrix-org/rav/saml_mapping_provider_updatesRichard van der Hoff2020-01-131-0/+1
| |\
| | * changelogRichard van der Hoff2020-01-121-0/+1
| * | Allow additional_resources to implement Resource directly (#6686)Richard van der Hoff2020-01-131-0/+1
| * | Fix exceptions on requests for non-ascii urls (#6682)Richard van der Hoff2020-01-131-0/+2
| * | changelogRichard van der Hoff2020-01-091-0/+1
| |/
* / changelogRichard van der Hoff2020-01-121-0/+1
|/
* Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-091-0/+1
* Merge branch 'master' into developErik Johnston2020-01-092-2/+0
|\
| * 1.8.0Erik Johnston2020-01-092-2/+0
* | Merge pull request #6664 from matrix-org/erikj/media_admin_apisErik Johnston2020-01-081-0/+1
|\ \
| * | NewsfileErik Johnston2020-01-081-0/+1
* | | Merge pull request #6665 from matrix-org/babolivier/retention_doc_typoBrendan Abolivier2020-01-081-0/+1
|\ \ \
| * | | ChangelogBrendan Abolivier2020-01-081-0/+1
* | | | Merge remote-tracking branch 'origin/release-v1.8.0' into developRichard van der Hoff2020-01-082-0/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-0/+1
| * | Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-081-0/+1
| |/
* | Merge pull request #6624 from matrix-org/babolivier/retention_docBrendan Abolivier2020-01-081-0/+1
|\ \
| * | Merge branch 'develop' into babolivier/retention_docBrendan Abolivier2020-01-0737-37/+0
| |\|
| * | Update changelog.d/6624.docBrendan Abolivier2020-01-071-1/+1
| * | Rename changelogBrendan Abolivier2020-01-031-0/+0
| * | Add a complete documentation of the message retention policies supportBrendan Abolivier2020-01-031-0/+1
* | | contrib/docker-compose: fixing mount that overrides containers' /etc (#6656)Fabian Meyer2020-01-081-0/+1
* | | Correctly proxy remote group HTTP errors. (#6654)Erik Johnston2020-01-071-0/+1
* | | Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoBrendan Abolivier2020-01-071-0/+1
|\ \ \ | |_|/ |/| |
| * | ChangelogBrendan Abolivier2020-01-031-0/+1
| |/
* | 1.8.0rc1Erik Johnston2020-01-0754-54/+0
* | Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-071-0/+1
|\ \
| * | ChangelogBrendan Abolivier2020-01-071-0/+1
| |/
* | Add a background update to clear tombstoned rooms from the directory (#6648)Richard van der Hoff2020-01-071-0/+1
* | Async/await for background updates (#6647)Richard van der Hoff2020-01-071-0/+1
* | port BackgroundUpdateTestCase to HomeserverTestCase (#6653)Richard van der Hoff2020-01-071-0/+1
* | Merge pull request #6645 from matrix-org/rav/fix_synchrotron_errorRichard van der Hoff2020-01-071-0/+1
|\ \
| * | changelogRichard van der Hoff2020-01-061-0/+1
* | | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-061-0/+1
|\ \ \ | |/ / |/| |
| * | changelogRichard van der Hoff2020-01-061-0/+1
* | | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-061-0/+1
* | | Add experimental 'databases' config (#6580)Erik Johnston2020-01-061-0/+1
* | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. (#...Richard van der Hoff2020-01-061-0/+1
* | | Fix exception when fetching notary server's old keys (#6625)Richard van der Hoff2020-01-061-0/+1
* | | Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-061-0/+1
|/ /
* | Fix power levels being incorrectly set in old and new rooms after a room upgr...Andrew Morgan2020-01-061-0/+1
* | Automate generation of the sample and debian log configs (#6627)Richard van der Hoff2020-01-031-0/+1
* | Raise an error if someone tries to use the log_file config option (#6626)Richard van der Hoff2020-01-031-0/+1
* | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-031-0/+1
* | Kill off redundant SynapseRequestFactory (#6619)Richard van der Hoff2020-01-031-0/+1
* | Reduce the reconnect time when replication fails. (#6617)Richard van der Hoff2020-01-031-0/+1
|/
* Added the section 'Configuration' in /docs/turn-howto.md (#6614)ewaf12020-01-021-0/+1
* Reword sections of federate.md that explained delegation at time of Synapse 1...Aaron Raimist2020-01-021-0/+1
* Split state groups into a separate data store (#6296)Erik Johnston2019-12-201-0/+1
* Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-201-0/+1
* Explode on duplicate delta file names. (#6565)Erik Johnston2019-12-191-0/+1
* Port some admin handlers to async/await (#6559)Erik Johnston2019-12-191-0/+1
* Improve diagnostics on database upgrade failure (#6570)Richard van der Hoff2019-12-191-0/+1
* Fix sdnotify with acme enabled (#6571)Richard van der Hoff2019-12-191-0/+1
* Add an export_signing_key script (#6546)Richard van der Hoff2019-12-191-0/+1
* Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-181-0/+1
* Add delta file to fix missing default table data (#6555)Andrew Morgan2019-12-181-0/+1
* Add database config class (#6513)Erik Johnston2019-12-181-0/+1
* Merge branch 'master' into developRichard van der Hoff2019-12-1811-13/+0
|\
| * Remove #6369 changelogAndrew Morgan2019-12-051-1/+0
* | Merge release-v1.7.1 into developRichard van der Hoff2019-12-182-0/+2
|\ \
| * | Fix bug where we added duplicate event IDs as auth_events (#6560)Erik Johnston2019-12-171-0/+1
| * | Add auth events as per spec. (#6556)Erik Johnston2019-12-161-0/+1
| * | Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-161-0/+1
| |\ \
| | * | Update changelog.d/6553.bugfixBrendan Abolivier2019-12-161-1/+1
| | * | ChangelogBrendan Abolivier2019-12-161-0/+1
| * | | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-0/+1
| * | | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-0/+1
| * | | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-161-0/+1
| * | | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-161-0/+2
| * | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-161-0/+2
| * | | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-161-0/+1
| * | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-161-0/+1
| * | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-161-0/+1
| |/ /
* | | Remove unused `get_pagination_rows` methods. (#6557)Erik Johnston2019-12-171-0/+1
* | | Add auth events as per spec. (#6556)Erik Johnston2019-12-161-0/+1
* | | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-0/+1
* | | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-161-0/+1
* | | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-161-0/+1
* | | Automatically delete empty groups/communities (#6453)Werner Sembach2019-12-161-0/+1
* | | Document Shutdown Room admin API (#6541)Andrew Morgan2019-12-131-0/+1
* | | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-131-0/+1
* | | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-131-0/+2
* | | Merge pull request #6537 from matrix-org/erikj/bump_mypy_versionErik Johnston2019-12-131-0/+1
|\ \ \
| * | | NewsfileErik Johnston2019-12-121-0/+1
* | | | Adjust the sytest blacklist for worker mode (#6538)Richard van der Hoff2019-12-131-0/+1
* | | | Merge pull request #6496 from matrix-org/erikj/initial_sync_asnycErik Johnston2019-12-131-0/+1
|\ \ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sy...Erik Johnston2019-12-1166-49/+16
| |\ \ \ \
| * | | | | NewsfileErik Johnston2019-12-091-0/+1
* | | | | | Merge pull request #6534 from matrix-org/erikj/extend_mypyErik Johnston2019-12-121-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | NewsfileErik Johnston2019-12-121-0/+1
* | | | | | look up cross-signing keys from the DB in bulk (#6486)Hubert Chathi2019-12-121-0/+1
* | | | | | Fix redacted events being returned in search results ordered by "recent" (#6522)Andrew Morgan2019-12-121-0/+1
|/ / / / /
* | | | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-121-0/+2
* | | | | Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_appsErik Johnston2019-12-121-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | NewsfileErik Johnston2019-12-101-0/+1
* | | | | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-111-0/+1
* | | | | Merge pull request #6517 from matrix-org/rav/event_auth/13Richard van der Hoff2019-12-111-0/+1
|\ \ \ \ \
| * | | | | changelogRichard van der Hoff2019-12-111-0/+1
* | | | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_awaitErik Johnston2019-12-111-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | NewsfileErik Johnston2019-12-101-0/+1
| |/ / / /
* | | | | Clean up some logging (#6515)Richard van der Hoff2019-12-111-0/+1
* | | | | Merge tag 'v1.7.0rc2' into developErik Johnston2019-12-112-2/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 1.7.0rc2 v1.7.0rc2Erik Johnston2019-12-114-4/+0
| * | | | Back out change preventing setting null avatar URLsErik Johnston2019-12-111-1/+1
| * | | | Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into relea...Erik Johnston2019-12-112-0/+2
| |\ \ \ \
| * | | | | Fixup changelogsBrendan Abolivier2019-12-102-2/+2
| * | | | | ChangelogBrendan Abolivier2019-12-101-0/+1
| * | | | | ChangelogBrendan Abolivier2019-12-101-0/+1
* | | | | | Prevent redacted events from appearing in message search (#6377)Andrew Morgan2019-12-111-0/+1
* | | | | | Add dev script to generate full SQL schema files (#6394)Andrew Morgan2019-12-111-0/+1
* | | | | | Prevent message search in upgraded rooms we're not in (#6385)Andrew Morgan2019-12-111-0/+1
* | | | | | Merge pull request #6349 from matrix-org/babolivier/msc1802Brendan Abolivier2019-12-111-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-12-0597-52/+45
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into babolivier/msc1802Brendan Abolivier2019-11-141-0/+1
| |\ \ \ \ \ \ \
| * | | | | | | | ChangelogBrendan Abolivier2019-11-111-0/+1
* | | | | | | | | Merge pull request #6512 from matrix-org/erikj/silence_mypyErik Johnston2019-12-111-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-12-101-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-101-0/+1
* | | | | | | | | Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-101-0/+1
* | | | | | | | | Merge pull request #6510 from matrix-org/erikj/phone_home_stats_dbErik Johnston2019-12-101-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-12-101-0/+1
| |/ / / / / / / /
* | | | | | | | | Fix race which caused deleted devices to reappear (#6514)Richard van der Hoff2019-12-101-0/+1
* | | | | | | | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-101-0/+1
* | | | | | | | | Remove redundant code from event authorisation implementation. (#6502)Richard van der Hoff2019-12-101-0/+1
* | | | | | | | | Merge pull request #6505 from matrix-org/erikj/make_deferred_yiedableErik Johnston2019-12-101-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-12-101-0/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6499 from matrix-org/erikj/fix_sqlite_7Erik Johnston2019-12-101-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | NewsfileErik Johnston2019-12-091-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cacheErik Johnston2019-12-101-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | NewsfileErik Johnston2019-12-101-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge tag 'v1.7.0rc1' into developNeil Johnson2019-12-0952-52/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | 1.7.0rc1 v1.7.0rc1Neil Johnson2019-12-0953-53/+0
| * | | | | | Systemd documentation (#6490)Clifford Garwood II2019-12-091-0/+1
* | | | | | | Better errors regarding changing avatar_url (#6497)Andrew Morgan2019-12-091-0/+1
|/ / / / / /
* | | | | | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Neil Johnson2019-12-091-0/+1
* | | | | | Merge pull request #6487 from matrix-org/erikj/pass_in_dbErik Johnston2019-12-091-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | NewsfileErik Johnston2019-12-061-0/+1
* | | | | | Merge pull request #6493 from matrix-org/erikj/invite_state_configErik Johnston2019-12-091-0/+1
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2019-12-091-0/+1
| |/ / / / /
* | | | | | Fix inaccurate per-block metrics (#6491)Richard van der Hoff2019-12-091-0/+1
* | | | | | Remove fallback for missing /federation/v1/state_ids API (#6488)Richard van der Hoff2019-12-091-0/+1
* | | | | | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-091-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | NewsfileErik Johnston2019-12-051-0/+1
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-067-0/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-052-0/+2
| |/ / / /
| * | | | NewsfileErik Johnston2019-12-051-0/+1
| * | | | Merge pull request #6482 from matrix-org/erikj/port_rest_v1Erik Johnston2019-12-051-0/+1
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-12-051-0/+1
| * | | | | Merge branch 'master' of github.com:matrix-org/synapse into developAndrew Morgan2019-12-051-0/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Modify systemd unit file reference to align with installation instruction (#6...Clifford Garwood II2019-12-051-0/+1
| | * | | | 1.6.1 v1.6.1 release-v1.6.1Andrew Morgan2019-11-282-2/+0
| | * | | | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-281-0/+1
| | * | | | Fix startup error when http proxy is defined. (#6421)Richard van der Hoff2019-11-271-0/+1
| | * | | | 1.6.0 v1.6.0 release-v1.6.0Andrew Morgan2019-11-261-1/+0
| | * | | | Fix phone home stats (#6418)Erik Johnston2019-11-261-0/+1
| | * | | | 1.6.0rc2 v1.6.0rc2Richard van der Hoff2019-11-251-1/+0
| | * | | | Fix exceptions from background database update for event labels. (#6407)Richard van der Hoff2019-11-251-0/+1
| * | | | | Revert "Modify systemd unit file reference to align with installation instruc...Andrew Morgan2019-12-051-1/+0
| * | | | | Modify systemd unit file reference to align with installation instruction (#6...Clifford Garwood II2019-12-051-0/+1
| | |/ / / | |/| | |
| * | | | Stronger typing in the federation handler (#6480)Richard van der Hoff2019-12-051-0/+1
| * | | | Sanity-check the rooms of auth events before pulling them in. (#6472)Richard van der Hoff2019-12-051-0/+1
* | | | | NewsfileErik Johnston2019-12-051-0/+1
|/ / / /
* | | | Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseErik Johnston2019-12-051-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-12-041-0/+1
* | | | | Merge pull request #6470 from matrix-org/babolivier/port_db_ci_failureBrendan Abolivier2019-12-041-0/+1
|\ \ \ \ \
| * | | | | ChangelogBrendan Abolivier2019-12-041-0/+1
| |/ / / /
* / / / / get rid of (most of) have_events from _update_auth_events_and_context_for_aut...Richard van der Hoff2019-12-041-0/+1
|/ / / /
* | | | Merge pull request #6454 from matrix-org/erikj/clean_base_StoreErik Johnston2019-12-041-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-12-041-0/+1
* | | | | Merge pull request #6441 from syamgk/fix-parameter-mismatchErik Johnston2019-12-041-0/+1
|\ \ \ \ \
| * | | | | Add changelog fileSyam G Krishnan2019-12-041-0/+1
* | | | | | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-041-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-0465-40/+25
| |\ \ \ \ \ \
| * | | | | | | Incorporate reviewBrendan Abolivier2019-12-042-1/+1
| * | | | | | | Format changelogBrendan Abolivier2019-11-201-1/+1
| * | | | | | | Update changelog since this isn't going to be featured in 1.6.0Brendan Abolivier2019-11-201-1/+1
| * | | | | | | ChangelogBrendan Abolivier2019-11-051-0/+1
* | | | | | | | Markdownification and other fixes to CONTRIBUTING (#6461)Andrew Morgan2019-12-041-0/+1
* | | | | | | | Fix error when using synapse_port_db on a vanilla synapse db (#6449)Andrew Morgan2019-12-041-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update changelog.d/6449.bugfixAndrew Morgan2019-12-041-1/+1
| * | | | | | | Add changelogAndrew Morgan2019-12-021-0/+1
* | | | | | | | Merge pull request #6451 from matrix-org/uhoreg/cross_signing_signatures_indexErik Johnston2019-12-041-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | apply changes from reviewHubert Chathi2019-12-031-1/+1
| * | | | | | | | add changelogHubert Chathi2019-12-021-0/+1
| |/ / / / / / /
* | | | | | | | privacy by default for room dir (#6355)Neil Johnson2019-12-041-0/+1
* | | | | | | | Fix exception when a cross-signed device is deleted (#6462)Richard van der Hoff2019-12-041-0/+1
* | | | | | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+1
* | | | | | | | write some docs for the quarantine_media api (#6458)Richard van der Hoff2019-12-031-0/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Add benchmarks for structured logging performance (#6266)Amber Brown2019-12-031-0/+1
|/ / / / / /
* | | | | | Transfer power level state events on room upgrade (#6237)Andrew Morgan2019-12-021-0/+1
* | | | | | Use python3 packages for Ubuntu (#6443)Andrew Morgan2019-12-021-0/+1
* | | | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Filip Štědronský2019-12-021-0/+1
| |/ / / / |/| | | |
* | | | | Add User-Interactive Auth to /account/3pid/add (#6119)Andrew Morgan2019-11-291-0/+1
* | | | | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasonsErik Johnston2019-11-291-0/+1
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-11-281-0/+1
* | | | | | ChangelogBrendan Abolivier2019-11-281-0/+1
|/ / / / /
* | | | | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-281-0/+1
* | | | | Clarifications for the email configuration settings. (#6423)Richard van der Hoff2019-11-281-0/+1
* | | | | Implementation of MSC2314 (#6176)Amber Brown2019-11-281-0/+1
* | | | | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-0/+1
* | | | | Add more tests to the worker blacklist (#6429)Richard van der Hoff2019-11-271-0/+1
* | | | | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-271-0/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-2647-38/+9
| |\ \ \ \ \
| * | | | | | Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+1
* | | | | | | Remove assertion and provide a clear warning on startup for missing public_ba...Andrew Morgan2019-11-261-0/+1
* | | | | | | Merge pull request #6343 from matrix-org/rav/event_auth/4Richard van der Hoff2019-11-261-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/event_auth/4Richard van der Hoff2019-11-186-0/+6
| |\ \ \ \ \ \ \
| * | | | | | | | newsfileRichard van der Hoff2019-11-081-0/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix startup error when http proxy is defined. (#6421)Richard van der Hoff2019-11-261-0/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | NewsfileErik Johnston2019-11-261-0/+1
* | | | | | | Prevent account_data content from being sent over TCP replication (#6333)Andrew Morgan2019-11-261-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account...Andrew Morgan2019-11-142-0/+2
| |\ \ \ \ \ \ \
| * | | | | | | | Add changelogAndrew Morgan2019-11-081-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fixErik Johnston2019-11-261-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixup docsErik Johnston2019-11-261-1/+1
| * | | | | | | | NewsfileErik Johnston2019-11-051-0/+1
* | | | | | | | | Make sure that we close cursors before returning from a query (#6408)Richard van der Hoff2019-11-251-0/+1
* | | | | | | | | Improve the performance of structured logging (#6322)Amber Brown2019-11-261-0/+1
* | | | | | | | | Merge pull request #6392 from matrix-org/babolivier/fix-1623Brendan Abolivier2019-11-251-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ChangelogBrendan Abolivier2019-11-201-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Add working build command for docker image (#6390)Andrew Morgan2019-11-231-0/+1
* | | | | | | | | Fix link to user_dir_populate.sql in the user directory docs (#6388)Aaron Raimist2019-11-211-0/+1
* | | | | | | | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-211-0/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 1.6.0rc1 v1.6.0rc1Andrew Morgan2019-11-2060-60/+0
* | | | | | | | Docker: Change permissions for data dir before attempting to write to it (#6389)Andrew Morgan2019-11-201-0/+1
* | | | | | | | Move admin endpoints into separate files (#6308)Manuel Stahl2019-11-201-0/+1
* | | | | | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanupsBrendan Abolivier2019-11-201-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | NewsfileErik Johnston2019-11-061-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Replace UPDATE with UPSERT on device_max_stream_id table (#6363)Andrew Morgan2019-11-151-0/+1
* | | | | | | Add optional python dependencies to snap packaging (#6317)James2019-11-141-0/+1
* | | | | | | Fix guest -> real account upgrade with account validity enabled (#6359)Andrew Morgan2019-11-141-0/+1
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_...Andrew Morgan2019-11-142-0/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Brendan Abolivier2019-11-141-0/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Set room version default to 5Neil Johnson2019-10-191-0/+1
| * | | | | | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2019-11-131-0/+1
| | |_|/ / / | |/| | | |
* / | | | | Add changelogAndrew Morgan2019-11-121-0/+1
|/ / / / /
* | | | | Merge pull request #6340 from matrix-org/babolivier/pagination_queryBrendan Abolivier2019-11-081-0/+1
|\ \ \ \ \
| * | | | | ChangelogBrendan Abolivier2019-11-071-0/+1
* | | | | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-081-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-051-0/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-0413-0/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-10-316-0/+6
| |\ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2019-10-301-0/+1
* | | | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_updateBrendan Abolivier2019-11-071-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update changelogBrendan Abolivier2019-11-051-1/+1
| * | | | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_updateBrendan Abolivier2019-11-042-0/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | ChangelogBrendan Abolivier2019-11-041-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Python 3.8 for tox (#6341)Richard van der Hoff2019-11-071-0/+1