summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Expand)AuthorAgeFilesLines
* Update changelog.d/6449.bugfixAndrew Morgan2019-12-041-1/+1
* Add changelogAndrew Morgan2019-12-021-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
* | | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groupsAndrew Morgan2019-11-071-0/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad...Andrew Morgan2019-11-041-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Transfer upgraded rooms on groupsAndrew Morgan2019-11-041-0/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | tweak changelogRichard van der Hoff2019-11-071-1/+1
* | | | | | | | | Fix LruCache callback deduplication (#6213)V024602019-11-071-0/+1
* | | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking (#6...Andrew Morgan2019-11-061-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add changelogAndrew Morgan2019-11-061-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into developRichard van der Hoff2019-11-062-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-061-0/+1
* | | | | | | | | Add some checks that we aren't using state from rejected events (#6330)Richard van der Hoff2019-11-051-0/+1
* | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_statsErik Johnston2019-11-051-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-11-051-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Richard van der Hoff2019-11-051-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix exception when OpenGraph tag values are intsRichard van der Hoff2019-11-051-0/+1
* | | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-0541-0/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | / / / / / Improve documentation for EventContext fields (#6319)Richard van der Hoff2019-11-051-0/+1
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Remove the psutil dependency (#6318)Amber Brown2019-11-051-0/+1
| | |/ / / / / | |/| | | | |
| * | | | | | document the REPLICATE command a bit better (#6305)Richard van der Hoff2019-11-041-0/+1
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-011-0/+1
| |\ \ \ \ \
| | * | | | | Incorporate reviewBrendan Abolivier2019-11-011-1/+1
| | * | | | | ChangelogBrendan Abolivier2019-10-301-0/+1
| * | | | | | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-011-0/+1
| * | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schemaHubert Chathi2019-11-011-0/+1
| |\ \ \ \ \ \
| | * | | | | | add changelogHubert Chathi2019-10-311-0/+1
| * | | | | | | Add contributer docs for using the provided linters script (#6164)Jason Robinson2019-11-021-0/+1
| * | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-011-0/+1
| * | | | | | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-011-0/+1
| * | | | | | | Document lint.sh & allow application to specified files only (#6312)Neil Pilgrim2019-11-011-0/+1
| * | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-011-0/+1
| * | | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-319-0/+9
| |\| | | | | |
| | * | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-311-0/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-317-0/+7
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-3022-2/+20
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | add changelogHubert Chathi2019-10-241-0/+1
| | * | | | | | | | rstrip slashes from url on appservice (#6306)Will Hunt2019-10-311-0/+1
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Update black to 19.10b0 (#6304)Amber Brown2019-11-011-0/+1
| | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-311-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | NewsfileErik Johnston2019-10-301-0/+1
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Expose some homeserver functionality to spam checkers (#6259)Travis Ralston2019-10-311-0/+1
| | * | | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_roomErik Johnston2019-10-311-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | NewsfileErik Johnston2019-10-311-0/+1
| | * | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-10-311-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | / / | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Update email section of INSTALL.md about account_threepid_delegates (#6272)Andrew Morgan2019-10-301-0/+1
| | * | | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-311-0/+1
| | * | | | | | fix delete_existing for _persist_events (#6300)Richard van der Hoff2019-10-301-0/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3022-2/+20
| |\| | | | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-3076-60/+19
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorErik Johnston2019-10-301-0/+1
| | | |\ \ \ \ \
| | | | * | | | | NewsfileErik Johnston2019-10-301-0/+1
| | | * | | | | | Modify doc to update Google ReCaptcha terms (#6257)Yash Jipkate2019-10-301-0/+1
| | | * | | | | | Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-301-0/+1
| | | * | | | | | Update CI to run isort on scripts and scripts-dev (#6270)Andrew Morgan2019-10-301-0/+1
| | | * | | | | | Fix small typo in comment (#6269)Andrew Morgan2019-10-301-0/+1
| | | |/ / / / /
| | | * | | | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-301-0/+1
| | | * | | | | Remove redundant arguments to CI's flake8 (#6277)Andrew Morgan2019-10-301-0/+1
| | | * | | | | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2019-10-301-0/+1
| | | * | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-301-0/+1
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s...Erik Johnston2019-10-293-2/+2
| | | | |\ \ \ \ \
| | | | * | | | | | NewsfileErik Johnston2019-10-291-0/+1
| | | * | | | | | | Merge pull request #6274 from matrix-org/erikj/replication_asyncErik Johnston2019-10-301-0/+1
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio...Erik Johnston2019-10-292-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|_|/ / | | | | | |/| | | | |
| | | | * | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| | | * | | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsErik Johnston2019-10-301-0/+1
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_...Erik Johnston2019-10-292-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | | * | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| | | | | |/ / / / / | | | | |/| | | | |
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation...Erik Johnston2019-10-293-2/+2
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| / / / / | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Fix CI for synapse_port_db (#6276)Brendan Abolivier2019-10-291-0/+1
| | | | * | | | | Merge branch 'master' into developRichard van der Hoff2019-10-291-1/+0
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | * | | | | Merge branch 'babolivier/changelog-name' into developBrendan Abolivier2019-10-291-0/+0
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * / | | | | NewsfileErik Johnston2019-10-291-0/+1
| | | |/ / / / /
| | | * | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsErik Johnston2019-10-291-0/+1
| | | |\ \ \ \ \
| | | | * | | | | NewsfileErik Johnston2019-10-281-0/+1
| | | * | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-291-0/+1
| | | |\ \ \ \ \ \
| | | * | | | | | | Add CI for synapse_port_db (#6140)Brendan Abolivier2019-10-281-0/+1
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge tag 'v1.5.0rc2' into developRichard van der Hoff2019-10-284-4/+0
| | | |\ \ \ \ \ \
| | | * | | | | | | Convert EventContext to attrs (#6218)Richard van der Hoff2019-10-281-0/+1
| | | * | | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysHubert Chathi2019-10-251-0/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | add changelogHubert Chathi2019-10-241-0/+1
| | | | | |_|_|_|/ / | | | | |/| | | | |
| | | * | | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-251-0/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-251-0/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingErik Johnston2019-10-251-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Reduce impact of debug loggingMichael Kaye2019-10-241-0/+1
| | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | * | | | | | | | | Add missing '.'Michael Kaye2019-10-241-1/+1
| | | * | | | | | | | | Add changelog.dMichael Kaye2019-10-241-0/+1
| | | |/ / / / / / / /
| | * | | | | | | | | NewsfileErik Johnston2019-10-231-0/+1
| * | | | | | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-2457-58/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | add news fileHubert Chathi2019-10-221-0/+1
* | | | | | | | | | | Strip overlong OpenGraph data from url previewRichard van der Hoff2019-11-051-0/+1
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | 1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0Richard van der Hoff2019-10-291-1/+0
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Fix changelog nameBrendan Abolivier2019-10-291-0/+0
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | 1.5.0rc2 v1.5.0rc2Richard van der Hoff2019-10-285-5/+0
* | | | | | | Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-281-0/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #6255 from matrix-org/erikj/stats_configErik Johnston2019-10-251-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | NewsfileErik Johnston2019-10-251-0/+1
| | |/ / / | |/| | |
* / | | | NewsfileErik Johnston2019-10-251-0/+1
|/ / / /
* | | | Merge pull request #6248 from matrix-org/erikj/move_schema_filesErik Johnston2019-10-241-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-10-241-0/+1
* | | | | Merge pull request #6247 from matrix-org/babolivier/port_db_columnBrendan Abolivier2019-10-241-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ChangelogBrendan Abolivier2019-10-241-0/+1
* | | | | 1.5.0rc1Andrew Morgan2019-10-2461-64/+0
|/ / / /
* | | | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-241-0/+1
* | | | Cleanup extra quotes from IDEs (#6236)Andrew Morgan2019-10-231-0/+1
* | | | ChangelogBrendan Abolivier2019-10-231-0/+1
* | | | Make synapse_port_db correctly create indexes (#6102)Brendan Abolivier2019-10-231-0/+1
| |/ / |/| |
* | | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-231-0/+1
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-222-0/+2
|\| |
| * | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Hubert Chathi2019-10-221-0/+1
| |\ \
| | * | Add changelog entryHubert Chathi2019-10-181-0/+1
| * | | Fix demo script on ipv6-supported boxes (#6229)Andrew Morgan2019-10-221-0/+1
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-226-0/+9
|\| | |
| * | | Delete format_tap.py (#6219)Andrew Morgan2019-10-191-0/+1
| | |/ | |/|
| * | Remove Auth.check method (#6217)Richard van der Hoff2019-10-181-0/+1
| |/
| * Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-182-0/+5
| |\
| | * Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-18113-66/+47
| | |\
| | * | add note about database upgradeHubert Chathi2019-10-181-1/+4
| | * | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-0719-0/+19
| | |\ \
| | * \ \ Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0416-1/+15
| | |\ \ \
| | * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2871-38/+33
| | |\ \ \ \
| | | * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-08-2886-53/+33
| | | |\ \ \ \
| | | * | | | | Cross-signing [1/4] -- hidden devices (#5759)Hubert Chathi2019-08-121-0/+1
| | * | | | | | fix formattingHubert Chathi2019-08-011-1/+1
| | * | | | | | add changelogHubert Chathi2019-08-011-0/+1
| | * | | | | | Merge branch 'develop' into cross-signing_hiddenHubert Chathi2019-07-3081-54/+30
| | |\ \ \ \ \ \
| | * | | | | | | add changelog fileHubert Chathi2019-07-301-0/+1
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-184-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix logging config for the docker image (#6197)Richard van der Hoff2019-10-181-0/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-1810-1/+9
| |\ \ \ \ \ \ \ \
| * | | | | | | | | changelogRichard van der Hoff2019-10-171-0/+1
* | | | | | | | | | NewsfileErik Johnston2019-10-211-0/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #6196 from matrix-org/erikj/awaitErik Johnston2019-10-181-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2019-10-111-0/+1
* | | | | | | | | | Add missing BOOLEAN_COLUMNs to synapse_port_db (#6216)Bart Noordervliet2019-10-181-0/+1
* | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-0/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Remove dead changelog fileRichard van der Hoff2019-10-171-1/+0
* | | | | | | | | Fix up changelogsRichard van der Hoff2019-10-171-0/+1
* | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add changelogHubert Chathi2019-10-101-0/+1
* | | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add changelogHubert Chathi2019-10-091-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_urlErik Johnston2019-10-111-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | NewsfileErik Johnston2019-10-111-0/+1
* | | | | | | | | | cas: support setting display name (#6114)Valérian Rousset2019-10-111-0/+1
|/ / / / / / / / /
* | | | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-111-0/+1
* | | | | | | | | Merge pull request #6156 from matrix-org/erikj/postgres_anyErik Johnston2019-10-101-0/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_anyErik Johnston2019-10-102-0/+2
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | NewsfileErik Johnston2019-10-101-0/+1
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...Erik Johnston2019-10-102-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fix python packagingRichard van der Hoff2019-10-101-0/+1
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerErik Johnston2019-10-101-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-104-0/+4
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2019-10-101-0/+1
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...Erik Johnston2019-10-1035-1/+35
|\| | | | | | | | |
| * | | | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-0/+1
| * | | | | | | | | before fulfilling a group invite,check if user is already joined/invited (#3436)Michael Telatynski2019-10-101-0/+1
| * | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-101-0/+1
| * | | | | | | | | Add snapcraft packaging information (#6084)James2019-10-101-0/+1
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-101-0/+1
| * | | | | | | | Rewrite the user_filter migration again (#6184)Richard van der Hoff2019-10-101-0/+1
| * | | | | | | | Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2019-10-101-0/+1
| * | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-101-0/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsErik Johnston2019-10-091-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Update changelog.d/6185.bugfixErik Johnston2019-10-091-1/+1
| * | | | | | | | Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updatesBrendan Abolivier2019-10-091-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ChangelogBrendan Abolivier2019-10-071-0/+1
| * | | | | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Anshul Angaria2019-10-081-0/+1
| * | | | | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2019-10-081-0/+1
| * | | | | | | | | Fix /federation/v1/state for recent room versions (#6170)Richard van der Hoff2019-10-081-0/+1
| * | | | | | | | | fix changelogRichard van der Hoff2019-10-071-1/+1
| * | | | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureErik Johnston2019-10-071-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixup newsfileErik Johnston2019-10-032-1/+1
| | * | | | | | | | | NewsfileErik Johnston2019-10-031-0/+1
| * | | | | | | | | | Log responder we are using. (#6139)Michael Kaye2019-10-071-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix changelog for PR #6175Brendan Abolivier2019-10-072-1/+1
| * | | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes...Richard van der Hoff2019-10-071-0/+1
| * | | | | | | | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_indexBrendan Abolivier2019-10-071-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ChangelogBrendan Abolivier2019-10-071-0/+1
| * | | | | | | | | | Merge pull request #6159 from matrix-org/erikj/cache_membershipsErik Johnston2019-10-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memb...Erik Johnston2019-10-031-0/+1
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | NewsfileErik Johnston2019-10-031-0/+1
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-041-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | ChangelogBrendan Abolivier2019-10-021-0/+1
| * | | | | | | | | | | Update `user_filters` table to have a unique index, and non-null columns (#1172)Alexander Maznev2019-10-041-0/+1
| * | | | | | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Robert Swain2019-10-041-0/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-031-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' into developAndrew Morgan2019-10-035-5/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #6154 from matrix-org/erikj/fix_appservice_paginationErik Johnston2019-10-021-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| * | | | | | | | | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatableErik Johnston2019-10-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \