summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3Richard van der Hoff2018-12-041-0/+1
|\
| * changelogAmber Brown2018-12-031-0/+1
* | Merge pull request #4257 from aaronraimist/add-editorconfigRichard van der Hoff2018-12-041-0/+1
|\ \
| * | Add a basic .editorconfigAaron Raimist2018-12-031-0/+1
| |/
* / Run the AS senders as background processes (#4189)Richard van der Hoff2018-12-041-0/+2
|/
* Workaround for non-ascii event ids (#4241)Richard van der Hoff2018-12-031-0/+1
* Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-0/+1
* Report combined coverage to codecov (#4225)Amber Brown2018-11-281-0/+1
* Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-281-0/+2
* Support m.login.sso (#4220)Richard van der Hoff2018-11-271-0/+1
* Check logcontexts before and after each test (#4190)Richard van der Hoff2018-11-271-0/+1
* Fix more logcontext leaks in tests (#4209)Richard van der Hoff2018-11-271-0/+1
* Do a GC after each test to fix logcontext leaks (#4227)Richard van der Hoff2018-11-271-0/+1
* Ignore __pycache__ directories in schema delta dirRichard van der Hoff2018-11-201-0/+1
* Remove riot.im from the list of trusted Identity Servers in the default confi...Neil Johnson2018-11-201-0/+1
* Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixesRichard van der Hoff2018-11-201-0/+1
|\
| * changelogRichard van der Hoff2018-11-191-0/+1
* | Merge remote-tracking branch 'origin/master' into developAmber Brown2018-11-1939-39/+0
|\ \
* | | Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-0/+1
| |/ |/|
* | Merge pull request #4182 from aaronraimist/update-issue-templateRichard van der Hoff2018-11-191-0/+1
|\ \
| * | Add changelogAaron Raimist2018-11-131-0/+1
* | | Add changelogAaron Raimist2018-11-181-0/+1
* | | Merge pull request #4193 from kivikakk/add-openbsd-prereqAmber Brown2018-11-171-0/+1
|\ \ \
| * | | add changelog.d entryAshe Connor2018-11-171-0/+1
* | | | ChangelogTravis Ralston2018-11-151-0/+1
|/ / /
* | | Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-151-0/+1
* | | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-151-0/+1
* | | Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-151-0/+1
* | | Add a coveragerc (#4180)Amber Brown2018-11-151-0/+1
* | | Update README for #1491 fixRichard van der Hoff2018-11-151-0/+1
* | | changelogRichard van der Hoff2018-11-141-0/+1
* | | Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbersDavid Baker2018-11-141-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a...David Baker2018-11-0958-30/+29
| |\ \ \
| * | | | news fragmentDavid Baker2018-10-301-0/+1
* | | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_eventsErik Johnston2018-11-091-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | NewsfileErik Johnston2018-11-081-0/+1
* | | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparisonErik Johnston2018-11-081-0/+1
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-11-081-0/+1
| |/ / / /
* / / / / changelogRichard van der Hoff2018-11-081-0/+1
|/ / / /
* | | | Port hash_password to Python 3 (#4161)Amber Brown2018-11-081-0/+1
* | | | Fix URL preview bugs (type error when loading cache from db, content-type inc...Amber Brown2018-11-081-0/+1
* | | | Merge pull request #4155 from rubo77/purge-apiRichard van der Hoff2018-11-071-0/+1
|\ \ \ \
| * | | | add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/rubo772018-11-071-0/+1
* | | | | Remove some boilerplate in tests (#4156)Amber Brown2018-11-071-0/+1
|/ / / /
* | | | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-063-2/+3
* | | | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-0/+1
* | | | Tests for user consent resource (#4140)Amber Brown2018-11-061-0/+1
* | | | Add some tests for the HTTP pusher (#4149)Amber Brown2018-11-061-0/+1
* | | | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-061-0/+1
* | | | Set the encoding to UTF8 in the default logconfig (#4138)Amber Brown2018-11-031-0/+1
* | | | Merge pull request #4137 from matrix-org/erikj/clean_up_eventsErik Johnston2018-11-021-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2018-11-021-0/+1
* | | | | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-031-0/+1
* | | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_lockingRichard van der Hoff2018-11-021-0/+1
|\ \ \ \ \
| * | | | | changelogRichard van der Hoff2018-11-021-0/+1
* | | | | | Merge pull request #4133 from matrix-org/travis/fix-terms-authRichard van der Hoff2018-11-021-0/+1
|\ \ \ \ \ \
| * | | | | | ChangelogTravis Ralston2018-11-011-0/+1
* | | | | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_noneErik Johnston2018-11-021-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | NewsfileErik Johnston2018-11-021-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3778 from z3ntu/patch-1Richard van der Hoff2018-11-011-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | changelog.d entry somehow got lostLuca Weiss2018-09-111-0/+1
* | | | | | Merge pull request #4004 from matrix-org/travis/login-termsTravis Ralston2018-11-011-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-3123-0/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-2417-0/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1815-11/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-152-0/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1264-61/+5
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | ChangelogTravis Ralston2018-10-031-0/+1
* | | | | | | | | | | Merge pull request #4128 from matrix-org/erikj/state_res_v2_versionErik Johnston2018-11-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | NewsfileErik Johnston2018-11-011-0/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-11-0129-30/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | changelog v0.33.8rc2Amber Brown2018-10-311-1/+0
| * | | | | | | | | Fix search 500ing (#4122)Amber Brown2018-10-311-0/+1
| * | | | | | | | | changelog v0.33.8rc1Amber Brown2018-10-2929-30/+0
* | | | | | | | | | Merge pull request #4101 from matrix-org/rav/aliases_for_upgradesRichard van der Hoff2018-10-311-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Attempt to move room aliases on room upgradesRichard van der Hoff2018-10-311-0/+1
* | | | | | | | | | | Log some bits about event creation (#4121)Richard van der Hoff2018-10-311-0/+1
* | | | | | | | | | | Merge pull request #4124 from matrix-org/rav/fix_toxRichard van der Hoff2018-10-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | changelogRichard van der Hoff2018-10-301-0/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120)Amber Brown2018-10-311-0/+1
* | | | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119)Amber Brown2018-10-311-0/+1
* | | | | | | | | | | Fix search 500ing (#4122)Amber Brown2018-10-311-0/+1
* | | | | | | | | | | Remove the unused /pull federation API (#4118)Amber Brown2018-10-311-0/+1
* | | | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groupsErik Johnston2018-10-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-2620-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-1912-3/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | NewsfileErik Johnston2018-10-041-0/+1
* | | | | | | | | | | | | Write some tests for the email pusher (#4095)Amber Brown2018-10-301-0/+1
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4109 from matrix-org/erikj/repl_devicesErik Johnston2018-10-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | NewsfileErik Johnston2018-10-291-0/+1
* | | | | | | | | | | | | NewsfileErik Johnston2018-10-291-0/+1
|/ / / / / / / / / / / /
* | | | / / / / / / / / Delete the disused & unspecced identicon functionality (#4106)Amber Brown2018-10-291-0/+1
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatarRichard van der Hoff2018-10-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remember to copy the avatar on room upgradesRichard van der Hoff2018-10-261-0/+1
* | | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_plsRichard van der Hoff2018-10-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Better handling of odd PLs during room upgradesRichard van der Hoff2018-10-271-0/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgradesRichard van der Hoff2018-10-291-0/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | changelogRichard van der Hoff2018-10-251-0/+1
* | | | | | | | | | | | Make the replication logger quieter (#4108)Amber Brown2018-10-291-0/+1
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-261-0/+1
* | | | | | | | | | | Merge pull request #4089 from dekonnection/masterRichard van der Hoff2018-10-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Make Docker image listening on ipv6 as well as ipv4Cédric Laudrel2018-10-251-0/+1
* | | | | | | | | | | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-251-0/+1
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-10-251-0/+1
|\| | | | | | | | | |
| * | | | | | | | | | Add CLsteamport2018-10-191-0/+1
* | | | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_listErik Johnston2018-10-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-2516-0/+16
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | NewsfileErik Johnston2018-10-191-0/+1
* | | | | | | | | | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | fix style inconsistenciesNeil Johnson2018-10-241-1/+2
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-249-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | remove white spaceNeil Johnson2018-10-231-1/+0
| * | | | | | | | | | | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-231-0/+2
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-2526-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid...Richard van der Hoff2018-10-242-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-241-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fix a number of flake8 errorsRichard van der Hoff2018-10-241-0/+1
| | * | | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-241-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | NewsfileErik Johnston2018-10-161-0/+1
| * | | | | | | | | | | | | | Allow backslashes in event field filtersRichard van der Hoff2018-10-241-0/+1
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | ChangelogRichard van der Hoff2018-10-221-0/+1
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creationErik Johnston2018-10-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | NewsfileErik Johnston2018-10-191-0/+1
| * | | | | | | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-231-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into travis/fix-federated-group-requestsTravis Ralston2018-10-1240-34/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | ChangelogTravis Ralston2018-09-261-0/+1
| * | | | | | | | | | | | | | Give some more things logcontexts (#4077)Richard van der Hoff2018-10-231-0/+1
| * | | | | | | | | | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-231-0/+1
| * | | | | | | | | | | | | | Merge pull request #3698 from spantaleev/add-matrix-docker-ansible-deployRichard van der Hoff2018-10-231-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add information about the matrix-docker-ansible-deploy playbookSlavi Pantaleev2018-10-141-0/+1
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontextsRichard van der Hoff2018-10-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Run MAU queries as background processesRichard van der Hoff2018-10-201-0/+1
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutilRichard van der Hoff2018-10-221-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Make psutil an explicit dependencyRichard van der Hoff2018-10-191-0/+1
| | |/ / / / / / / / / / / /
| * / / / / / / / / / / / / Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-201-0/+1
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065Richard van der Hoff2018-10-191-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Calculate absolute path for email templatesRichard van der Hoff2018-10-191-0/+1
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fix manhole on py3 (pt 2) (#4067)Amber Brown2018-10-191-0/+1
| * | | | | | | | | | | Make the metrics less racy (#4061)Amber Brown2018-10-191-0/+1
| * | | | | | | | | | | changelogAmber Brown2018-10-191-0/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Use the right python when starting workersRichard van der Hoff2018-10-181-0/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | remove redundant changelog fileRichard van der Hoff2018-10-181-1/+0
| * | | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-10-1810-11/+0
| |\| | | | | | | |
| | * | | | | | | | prep changelogRichard van der Hoff2018-10-172-13/+0
| | * | | | | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-171-0/+1
| | * | | | | | | | Ship the email templates as package_dataRichard van der Hoff2018-10-171-0/+12
| | * | | | | | | | update changelog v0.33.7rc1Amber Brown2018-10-1510-10/+0
| | * | | | | | | | update changelogAmber Brown2018-10-151-2/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge pull request #4049 from matrix-org/erikj/synctl_colourErik Johnston2018-10-181-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | NewsfileErik Johnston2018-10-171-0/+1
| * | | | | | | | | NewsfileErik Johnston2018-10-171-0/+1
| |/ / / / / / / /
| * | | | | | | | Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-171-0/+1
| * | | | | | | | Merge pull request #4045 from matrix-org/rav/fix_get_missing_eventsRichard van der Hoff2018-10-171-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-161-0/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * / | | | | | | changelogRichard van der Hoff2018-10-161-0/+1
| |/ / / / / / /
| * / / / / / / Various cleanups in the federation client code (#4031)Richard van der Hoff2018-10-161-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-151-0/+1
| |\ \ \ \ \ \
| | * | | | | | Add changelogDavid Baker2018-10-091-0/+1
| * | | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3Ivan Shapovalov2018-10-141-0/+1
| * | | | | | | synapse/visibility.py: fix SyntaxError on py3.7Ivan Shapovalov2018-10-141-0/+1
| | |/ / / / / | |/| | | | |
| * | | | | | Make workers work on Py3 (#4027)Amber Brown2018-10-131-0/+1
| * | | | | | Update newsfileErik Johnston2018-10-101-1/+1
| * | | | | | NewsfileErik Johnston2018-10-091-0/+1
| * | | | | | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptionsErik Johnston2018-10-091-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | NewsfileErik Johnston2018-10-051-0/+1
| * | | | | | Optimisation for filter_events_for_serverRichard van der Hoff2018-10-081-0/+1
| |/ / / / /
* | | | | | Update changelog.d/3975.featureRichard van der Hoff2018-10-241-1/+1
* | | | | | remove errant exception and styleNeil Johnson2018-10-231-1/+1
* | | | | | clean up config error logic and importsNeil Johnson2018-10-171-1/+1
* | | | | | improve auto room join logic, comments and testsNeil Johnson2018-10-121-1/+1
* | | | | | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-0447-45/+4
|\| | | | |
| * | | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliersRichard van der Hoff2018-10-041-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fix newsfile nameRichard van der Hoff2018-10-031-0/+0
| | * | | | Fix bug in forward_extremity update logicRichard van der Hoff2018-10-021-0/+1
| * | | | | Merge branch 'master' into developAmber Brown2018-10-0459-61/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6Amber Brown2018-10-041-1/+0
| | * | | | Pin to prometheus_client<0.4 to avoid renaming all of our metricsRichard van der Hoff2018-10-031-0/+1
| | * | | | changelog v0.33.6rc1Amber Brown2018-10-0359-61/+0
| | |/ / /
| * | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetionErik Johnston2018-10-031-0/+1
| |\ \ \ \
| | * | | | NewsfileErik Johnston2018-10-031-0/+1
| | |/ / /
| * | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iterationErik Johnston2018-10-031-0/+1
| |\ \ \ \
| | * | | | NewsfileErik Johnston2018-10-031-0/+1
| | |/ / /
| * / / / NewsfileErik Johnston2018-10-031-0/+1
| |/ / /
| * | | Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cacheErik Johnston2018-10-021-0/+1
| |\ \ \
| | * | | NewsfileErik Johnston2018-10-021-0/+1
| * | | | Remove Jenkins & other old dev junk (#3988)Amber Brown2018-10-031-0/+1
| |/ / /
| * | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_errorRichard van der Hoff2018-10-021-0/+1
| |\ \ \
| | * \ \ Merge branch 'develop' into rav/fix_missing_create_event_errorRichard van der Hoff2018-10-0121-0/+21
| | |\ \ \
| | * | | | changelogRichard van der Hoff2018-09-261-0/+1
| * | | | | Disable frozen dicts by default (#3987)Amber Brown2018-10-021-0/+1
| * | | | | NewsfileErik Johnston2018-10-021-0/+1
| * | | | | Merge pull request #3989 from matrix-org/rav/better_stacktracesRichard van der Hoff2018-10-021-0/+1
| |\ \ \ \ \
| | * | | | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-011-0/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-021-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | NewsfileErik Johnston2018-10-011-0/+1
| * | | | | Update instructions to point to pip install (#3985)Amber Brown2018-10-021-0/+1
| * | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-276-0/+6
| | |\ \ \ \ \
| | * | | | | | changelogRichard van der Hoff2018-09-271-0/+1
| * | | | | | | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-021-0/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cacheErik Johnston2018-10-011-0/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2814-0/+14
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cacheRichard van der Hoff2018-09-262-0/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cacheRichard van der Hoff2018-09-2544-39/+4
| | |\ \ \ \ \ \ \
| | * | | | | | | | NewsfileErik Johnston2018-09-211-0/+1
| * | | | | | | | | Further reduce the size of the docker image (#3972)Richard van der Hoff2018-10-011-0/+1
| * | | | | | | | | add --no-admin flag to registration script (#3836)Bruno Windels2018-09-281-0/+1
| * | | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-281-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_callRichard van der Hoff2018-09-281-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove redundant call to start_get_pdu_cacheRichard van der Hoff2018-09-281-0/+1
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * / | | | | | | | build python 3 docker images on circle CI (#3976)Jan Christian Grünhage2018-09-281-0/+1
| |/ / / / / / / /
* / / / / / / / / changelogMatthew Hodgson2018-09-291-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-1980-27/+53
| |\ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2018-09-191-0/+1
* | | | | | | | | | Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_uploadRichard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do the changelog.d danceMichael Kaye2018-09-271-0/+1
* | | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | changelogRichard van der Hoff2018-09-271-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_processAmber Brown2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update 3970.bugfixAmber Brown2018-09-271-1/+1
| * | | | | | | | | | Added changelog fragmentSchnuffle2018-09-271-0/+1
* | | | | | | | | | | Run our oldest supported configuration in CI (#3952)Amber Brown2018-09-271-0/+1
* | | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upsertsRichard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | towncrierNeil Johnson2018-09-261-0/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Logging improvementsRichard van der Hoff2018-09-261-0/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-271-0/+1
* | | | | | | | | | docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-271-0/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | changelogRichard van der Hoff2018-09-261-0/+1
|/ / / / / / / /
* / / / / / / / Reduce the load on our CI (#3957)Amber Brown2018-09-271-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_lenRichard van der Hoff2018-09-261-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | changelogRichard van der Hoff2018-09-261-0/+1
* | | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctlAmber Brown2018-09-261-0/+1
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2018-09-251-0/+1
* | | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-261-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | changelogRichard van der Hoff2018-09-201-0/+1
* | | | | | | | Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3Richard van der Hoff2018-09-251-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | add changelogJan Christian Grünhage2018-09-201-0/+1
* | | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-251-0/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | NewsfileErik Johnston2018-09-211-0/+1
* | | | | | | | added "media-src: 'self'" to CSP for resources (#3578)Jérémy Farnaud2018-09-251-0/+1
* | | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregisteredRichard van der Hoff2018-09-251-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2018-09-201-0/+1
* | | | | | | | | changelogRichard van der Hoff2018-09-251-0/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Only lazy load self-members on initial syncMatthew Hodgson2018-09-251-0/+1