summary refs log tree commit diff
path: root/changelog.d (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add changelogAndrew Morgan2019-01-221-0/+1
* Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-221-0/+1
* Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-221-0/+1
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv...Erik Johnston2019-01-2110-0/+10
|\
| * Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-211-0/+1
| |\
| * | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-211-0/+1
| * | Fix race when persisting create event (#4404)Erik Johnston2019-01-181-0/+1
| * | Tweak code coverage settings (#4400)Erik Johnston2019-01-181-0/+1
| * | Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-181-0/+1
| * | Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-171-0/+1
| * | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-171-0/+1
| * | Changing macaroon_secret_key no longer logs you out (#4387)Richard van der Hoff2019-01-161-0/+1
| * | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-161-0/+1
| * | Add a changelog entryAndrej Shadura2019-01-161-0/+1
| * | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-151-0/+1
* | | NewsfileErik Johnston2019-01-161-0/+1
| |/ |/|
* | NewsfileErik Johnston2019-01-151-0/+1
|/
* Silence travis-ci build warnings by removing non-functional python3.6 (#4377)Richard van der Hoff2019-01-121-0/+1
* Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-121-0/+1
* Merge pull request #4342 from aaronraimist/new-virtualenvRichard van der Hoff2019-01-101-0/+1
|\
| * Add changelogAaron Raimist2019-01-011-0/+1
* | Merge branch 'master' into developRichard van der Hoff2019-01-0942-43/+0
|\ \
| * | 0.34.1 v0.34.1Richard van der Hoff2019-01-092-2/+0
| * | Merge branch 'develop' into release-v0.34.1Erik Johnston2019-01-092-0/+2
| |\ \
| * | | changelogRichard van der Hoff2019-01-0840-41/+0
* | | | Merge pull request #4368 from matrix-org/erikj/better_errorsErik Johnston2019-01-091-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-01-091-0/+1
| | |/ / | |/| |
* / | | Fix adding new rows instead of updating them if one of the key values is a NU...Amber Brown2019-01-091-0/+1
|/ / /
* | | NewsfileErik Johnston2019-01-081-0/+1
* | | NewsfileErik Johnston2019-01-081-0/+1
|/ /
* | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-081-0/+1
* | Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-081-0/+1
* | Fix command hint to generate a config file (#4353)Jason Robinson2019-01-071-0/+1
* | Add GET account data routes (#4303)Travis Ralston2019-01-071-0/+1
* | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-071-0/+1
* | fix the check for whether `is_url` to match all the other ones in codebase (#...Michael Telatynski2019-01-061-0/+1
* | Update debian Conflicts specifications (#4349)Richard van der Hoff2019-01-041-0/+1
* | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-021-0/+1
* | Update README to not lie about required restart (#4343)Aaron Raimist2019-01-021-0/+1
* | Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-021-0/+1
* | Update PR template to use absolute links (#4341)Aaron Raimist2019-01-021-0/+1
* | Avoid packaging _trial_temp directory (#4326)Richard van der Hoff2019-01-021-0/+2
* | Install the optional dependencies into the debian package (#4325)Richard van der Hoff2019-01-021-0/+1
|/
* Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-291-0/+1
* Remove mention of lt-cred-mech in the sample coturn config. (#4333)Krithin Sitaram2018-12-281-0/+1
* Log roomid along with Unknown room (#4297)Will Hunt2018-12-241-0/+1
* Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-241-0/+1
|\
| * NewsfileErik Johnston2018-12-181-0/+1
* | Return well_known in /login response (#4319)Richard van der Hoff2018-12-241-0/+1
* | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5Richard van der Hoff2018-12-231-0/+1
|\ \
| * | Fix test_metrics.py compatibility prometheus_client 0.5Maarten de Vries2018-12-211-0/+1
* | | Merge pull request #4316 from matrix-org/rav/fix_docker_uploadRichard van der Hoff2018-12-211-0/+1
|\ \ \
| * | | Fix circleci config for synapse:latest docker uploadRichard van der Hoff2018-12-211-0/+1
| |/ /
* | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-221-0/+1
* | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-221-0/+1
* | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-221-0/+1
* | | Make the dependencies more like a standard Python project and hook up the opt...Amber Brown2018-12-221-0/+1
|/ /
* | Create 4309.bugfixNathan Pennie2018-12-191-0/+1
* | ensure can report mau stats when hs.config.mau_stats_only is set (#4305)Neil Johnson2018-12-181-0/+1
* | create support user (#4141)Neil Johnson2018-12-141-0/+1
* | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-0/+1
* | Improved welcome page (#4294)Nad Chishtie2018-12-141-0/+1
* | Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_linkRichard van der Hoff2018-12-111-0/+1
|\ \
| * | changelogMichael Kaye2018-12-071-0/+1
* | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-1134-36/+0
|\ \ \
| * | | 0.34.0rc2 v0.34.0rc2Richard van der Hoff2018-12-113-3/+0
| * | | remove changelog filesRichard van der Hoff2018-12-1134-36/+0
| * | | Merge pull request #4290 from matrix-org/rav/remove_webclientRichard van der Hoff2018-12-111-0/+1
| |\ \ \
| | * | | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-111-0/+1
| * | | | Merge branch 'rav/disable_pager_in_ci' into rav/welcome_pageRichard van der Hoff2018-12-111-0/+1
| |\ \ \ \
| | * | | | Disable pager for ci scriptRichard van der Hoff2018-12-111-0/+1
| | |/ / /
| * / / / Add a welcome page to the static resourcesRichard van der Hoff2018-12-111-0/+1
| |/ / /
* | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-111-0/+1
* | | | Merge pull request #4279 from matrix-org/hs/fix-config-corsWill Hunt2018-12-101-0/+1
|\ \ \ \
| * | | | changelog & isortWill Hunt2018-12-091-0/+1
| | |/ / | |/| |
* / | | NewsfileErik Johnston2018-12-101-0/+1
|/ / /
* | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-0/+1
* | | Update the example systemd config to use a virtualenv (#4273)Richard van der Hoff2018-12-071-0/+1
* | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-071-0/+1
* | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-071-0/+1
* | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-061-0/+1
* | | drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-061-0/+1
* | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-051-0/+1
|/ /
* | Merge pull request #4260 from matrix-org/rav/python3Richard van der Hoff2018-12-041-0/+1
|\ \
| * | Notes on upgrading to python3, and README updates.Richard van der Hoff2018-12-041-0/+1
* | | Remove obsolete settings from docker homeserver.yamlRichard van der Hoff2018-12-041-0/+1
|/ /
* | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-041-0/+1
* | Fix non-ASCII pushrules (#4248)Amber Brown2018-12-041-0/+1
* | Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-041-0/+1
* | Add note to UPGRADE.rst about removing riot.im from list of trusted identity ...Aaron Raimist2018-12-041-0/+1
* | add more detail to logging regarding "More than one row matched" error (#4234)Ben Parsons2018-12-041-0/+1
* | Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-041-0/+1
* | Merge pull request #4244 from aaronraimist/drop-sent-txtRichard van der Hoff2018-12-041-0/+1
|\ \
| * | Add changelogAaron Raimist2018-12-011-0/+1
* | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205)Richard van der Hoff2018-12-041-0/+1
* | | 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
| | | |_|_|/ / / / | | |/| | | | | |