Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #4279 from matrix-org/hs/fix-config-cors | Will Hunt | 2018-12-10 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | changelog & isort | Will Hunt | 2018-12-09 | 1 | -0/+1 | |
| | |/ / | |/| | | ||||||
* / | | | Newsfile | Erik Johnston | 2018-12-10 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 | |
* | | | Update the example systemd config to use a virtualenv (#4273) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 | |
* | | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 | |
* | | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 | |
* | | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 1 | -0/+1 | |
* | | | drop undocumented dependency on dateutil (#4266) | Richard van der Hoff | 2018-12-06 | 1 | -0/+1 | |
* | | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #4260 from matrix-org/rav/python3 | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | Notes on upgrading to python3, and README updates. | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 | |
* | | | Remove obsolete settings from docker homeserver.yaml | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 | |
|/ / | ||||||
* | | Add an option to enable recording IPs for appservice users (#3831) | Travis Ralston | 2018-12-04 | 1 | -0/+1 | |
* | | Fix non-ASCII pushrules (#4248) | Amber Brown | 2018-12-04 | 1 | -0/+1 | |
* | | Add an option to disable search for homeservers which may not be interested i... | Travis Ralston | 2018-12-04 | 1 | -0/+1 | |
* | | Add note to UPGRADE.rst about removing riot.im from list of trusted identity ... | Aaron Raimist | 2018-12-04 | 1 | -0/+1 | |
* | | add more detail to logging regarding "More than one row matched" error (#4234) | Ben Parsons | 2018-12-04 | 1 | -0/+1 | |
* | | Fix UnicodeDecodeError when postgres is not configured in english (#4253) | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 | |
* | | Merge pull request #4244 from aaronraimist/drop-sent-txt | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | Add changelog | Aaron Raimist | 2018-12-01 | 1 | -0/+1 | |
* | | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205) | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 | |
* | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3 | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | changelog | Amber Brown | 2018-12-03 | 1 | -0/+1 | |
* | | | | Merge pull request #4257 from aaronraimist/add-editorconfig | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | Add a basic .editorconfig | Aaron Raimist | 2018-12-03 | 1 | -0/+1 | |
| |/ / / | ||||||
* / / / | Run the AS senders as background processes (#4189) | Richard van der Hoff | 2018-12-04 | 1 | -0/+2 | |
|/ / / | ||||||
* / / | Workaround for non-ascii event ids (#4241) | Richard van der Hoff | 2018-12-03 | 1 | -0/+1 | |
|/ / | ||||||
* | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 1 | -0/+1 | |
* | | Report combined coverage to codecov (#4225) | Amber Brown | 2018-11-28 | 1 | -0/+1 | |
* | | Neilj/fix mau initial reserved users (#4211) | Neil Johnson | 2018-11-28 | 1 | -0/+2 | |
* | | Support m.login.sso (#4220) | Richard van der Hoff | 2018-11-27 | 1 | -0/+1 | |
* | | Check logcontexts before and after each test (#4190) | Richard van der Hoff | 2018-11-27 | 1 | -0/+1 | |
* | | Fix more logcontext leaks in tests (#4209) | Richard van der Hoff | 2018-11-27 | 1 | -0/+1 | |
* | | Do a GC after each test to fix logcontext leaks (#4227) | Richard van der Hoff | 2018-11-27 | 1 | -0/+1 | |
* | | Ignore __pycache__ directories in schema delta dir | Richard van der Hoff | 2018-11-20 | 1 | -0/+1 | |
* | | Remove riot.im from the list of trusted Identity Servers in the default confi... | Neil Johnson | 2018-11-20 | 1 | -0/+1 | |
* | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | changelog | Richard van der Hoff | 2018-11-19 | 1 | -0/+1 | |
* | | | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2018-11-19 | 39 | -39/+0 | |
|\ \ \ | | |/ | |/| | ||||||
* | | | Fix fallback auth on Python 3 (#4197) | Amber Brown | 2018-11-19 | 1 | -0/+1 | |
| |/ |/| | ||||||
* | | Merge pull request #4182 from aaronraimist/update-issue-template | Richard van der Hoff | 2018-11-19 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | Add changelog | Aaron Raimist | 2018-11-13 | 1 | -0/+1 | |
* | | | Add changelog | Aaron Raimist | 2018-11-18 | 1 | -0/+1 | |
* | | | Merge pull request #4193 from kivikakk/add-openbsd-prereq | Amber Brown | 2018-11-17 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | add changelog.d entry | Ashe Connor | 2018-11-17 | 1 | -0/+1 | |
* | | | | Changelog | Travis Ralston | 2018-11-15 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Fix Content-Disposition in media repository (#4176) | Amber Brown | 2018-11-15 | 1 | -0/+1 | |
* | | | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 1 | -0/+1 | |
* | | | Use <meta> tags to discover the per-page encoding of html previews (#4183) | Amber Brown | 2018-11-15 | 1 | -0/+1 | |
* | | | Add a coveragerc (#4180) | Amber Brown | 2018-11-15 | 1 | -0/+1 | |
* | | | Update README for #1491 fix | Richard van der Hoff | 2018-11-15 | 1 | -0/+1 | |
* | | | changelog | Richard van der Hoff | 2018-11-14 | 1 | -0/+1 | |
* | | | Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbers | David Baker | 2018-11-14 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a... | David Baker | 2018-11-09 | 58 | -30/+29 | |
| |\ \ \ | ||||||
| * | | | | news fragment | David Baker | 2018-10-30 | 1 | -0/+1 | |
* | | | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_events | Erik Johnston | 2018-11-09 | 1 | -0/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Newsfile | Erik Johnston | 2018-11-08 | 1 | -0/+1 | |
* | | | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparison | Erik Johnston | 2018-11-08 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2018-11-08 | 1 | -0/+1 | |
| |/ / / / | ||||||
* / / / / | changelog | Richard van der Hoff | 2018-11-08 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Port hash_password to Python 3 (#4161) | Amber Brown | 2018-11-08 | 1 | -0/+1 | |
* | | | | Fix URL preview bugs (type error when loading cache from db, content-type inc... | Amber Brown | 2018-11-08 | 1 | -0/+1 | |
* | | | | Merge pull request #4155 from rubo77/purge-api | Richard van der Hoff | 2018-11-07 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/ | rubo77 | 2018-11-07 | 1 | -0/+1 | |
* | | | | | Remove some boilerplate in tests (#4156) | Amber Brown | 2018-11-07 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 3 | -2/+3 | |
* | | | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -0/+1 | |
* | | | | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 1 | -0/+1 | |
* | | | | Add some tests for the HTTP pusher (#4149) | Amber Brown | 2018-11-06 | 1 | -0/+1 | |
* | | | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 1 | -0/+1 | |
* | | | | Set the encoding to UTF8 in the default logconfig (#4138) | Amber Brown | 2018-11-03 | 1 | -0/+1 | |
* | | | | Merge pull request #4137 from matrix-org/erikj/clean_up_events | Erik Johnston | 2018-11-02 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | Newsfile | Erik Johnston | 2018-11-02 | 1 | -0/+1 | |
* | | | | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 1 | -0/+1 | |
* | | | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_locking | Richard van der Hoff | 2018-11-02 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | changelog | Richard van der Hoff | 2018-11-02 | 1 | -0/+1 | |
* | | | | | | Merge pull request #4133 from matrix-org/travis/fix-terms-auth | Richard van der Hoff | 2018-11-02 | 1 | -0/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Changelog | Travis Ralston | 2018-11-01 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_none | Erik Johnston | 2018-11-02 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Newsfile | Erik Johnston | 2018-11-02 | 1 | -0/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #3778 from z3ntu/patch-1 | Richard van der Hoff | 2018-11-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | changelog.d entry somehow got lost | Luca Weiss | 2018-09-11 | 1 | -0/+1 | |
* | | | | | | Merge pull request #4004 from matrix-org/travis/login-terms | Travis Ralston | 2018-11-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 23 | -0/+24 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 17 | -0/+17 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 15 | -11/+5 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-15 | 2 | -0/+3 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-12 | 64 | -61/+5 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Changelog | Travis Ralston | 2018-10-03 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #4128 from matrix-org/erikj/state_res_v2_version | Erik Johnston | 2018-11-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-11-01 | 1 | -0/+1 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-11-01 | 29 | -30/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | changelog v0.33.8rc2 | Amber Brown | 2018-10-31 | 1 | -1/+0 | |
| * | | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -0/+1 | |
| * | | | | | | | | | changelog v0.33.8rc1 | Amber Brown | 2018-10-29 | 29 | -30/+0 | |
* | | | | | | | | | | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades | Richard van der Hoff | 2018-10-31 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Attempt to move room aliases on room upgrades | Richard van der Hoff | 2018-10-31 | 1 | -0/+1 | |
* | | | | | | | | | | | Log some bits about event creation (#4121) | Richard van der Hoff | 2018-10-31 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #4124 from matrix-org/rav/fix_tox | Richard van der Hoff | 2018-10-31 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-10-30 | 1 | -0/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Remove fetching keys via the deprecated v1 kex method (#4120) | Amber Brown | 2018-10-31 | 1 | -0/+1 | |
* | | | | | | | | | | | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 1 | -0/+1 | |
* | | | | | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -0/+1 | |
* | | | | | | | | | | | Remove the unused /pull federation API (#4118) | Amber Brown | 2018-10-31 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #4006 from matrix-org/erikj/purge_state_groups | Erik Johnston | 2018-10-30 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat... | Erik Johnston | 2018-10-26 | 20 | -0/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat... | Erik Johnston | 2018-10-19 | 12 | -3/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-04 | 1 | -0/+1 | |
* | | | | | | | | | | | | | Write some tests for the email pusher (#4095) | Amber Brown | 2018-10-30 | 1 | -0/+1 | |
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #4109 from matrix-org/erikj/repl_devices | Erik Johnston | 2018-10-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-29 | 1 | -0/+1 | |
* | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-29 | 1 | -0/+1 | |
|/ / / / / / / / / / / / | ||||||
* | | | / / / / / / / / | Delete the disused & unspecced identicon functionality (#4106) | Amber Brown | 2018-10-29 | 1 | -0/+1 | |
| |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar | Richard van der Hoff | 2018-10-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remember to copy the avatar on room upgrades | Richard van der Hoff | 2018-10-26 | 1 | -0/+1 | |
* | | | | | | | | | | | | Merge pull request #4099 from matrix-org/rav/upgrade_odd_pls | Richard van der Hoff | 2018-10-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 1 | -0/+1 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 1 | -0/+1 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-10-25 | 1 | -0/+1 | |
* | | | | | | | | | | | | Make the replication logger quieter (#4108) | Amber Brown | 2018-10-29 | 1 | -0/+1 | |
| |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #4089 from dekonnection/master | Richard van der Hoff | 2018-10-25 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Make Docker image listening on ipv6 as well as ipv4 | Cédric Laudrel | 2018-10-25 | 1 | -0/+1 | |
* | | | | | | | | | | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-10-25 | 1 | -0/+1 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add CL | steamport | 2018-10-19 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... | Erik Johnston | 2018-10-25 | 16 | -0/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-19 | 1 | -0/+1 | |
* | | | | | | | | | | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_init | Neil Johnson | 2018-10-25 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fix style inconsistencies | Neil Johnson | 2018-10-24 | 1 | -1/+2 | |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 9 | -0/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | remove white space | Neil Johnson | 2018-10-23 | 1 | -1/+0 | |
| * | | | | | | | | | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 1 | -0/+2 | |
* | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea... | Neil Johnson | 2018-10-25 | 26 | -4/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid... | Richard van der Hoff | 2018-10-24 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-16 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-10-22 | 1 | -0/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-10-19 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into travis/fix-federated-group-requests | Travis Ralston | 2018-10-12 | 40 | -34/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Changelog | Travis Ralston | 2018-09-26 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Give some more things logcontexts (#4077) | Richard van der Hoff | 2018-10-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Merge pull request #3698 from spantaleev/add-matrix-docker-ansible-deploy | Richard van der Hoff | 2018-10-23 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Add information about the matrix-docker-ansible-deploy playbook | Slavi Pantaleev | 2018-10-14 | 1 | -0/+1 | |
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #4076 from matrix-org/rav/fix_init_logcontexts | Richard van der Hoff | 2018-10-22 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 1 | -0/+1 | |
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #4073 from matrix-org/rav/require_psutil | Richard van der Hoff | 2018-10-22 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 1 | -0/+1 | |
| | |/ / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on... | Amber Brown | 2018-10-20 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge pull request #4069 from matrix-org/rav/fix_email_templates_4065 | Richard van der Hoff | 2018-10-19 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Calculate absolute path for email templates | Richard van der Hoff | 2018-10-19 | 1 | -0/+1 | |
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix manhole on py3 (pt 2) (#4067) | Amber Brown | 2018-10-19 | 1 | -0/+1 | |
| * | | | | | | | | | | | Make the metrics less racy (#4061) | Amber Brown | 2018-10-19 | 1 | -0/+1 | |
| * | | | | | | | | | | | changelog | Amber Brown | 2018-10-19 | 1 | -0/+1 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Use the right python when starting workers | Richard van der Hoff | 2018-10-18 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
| * | | | | | | | | | remove redundant changelog file | Richard van der Hoff | 2018-10-18 | 1 | -1/+0 | |
| * | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-10-18 | 10 | -11/+0 | |
| |\| | | | | | | | | ||||||
| | * | | | | | | | | prep changelog | Richard van der Hoff | 2018-10-17 | 2 | -13/+0 | |
| | * | | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-17 | 1 | -0/+1 | |
| | * | | | | | | | | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 1 | -0/+12 | |
| | * | | | | | | | | update changelog v0.33.7rc1 | Amber Brown | 2018-10-15 | 10 | -10/+0 | |
| | * | | | | | | | | update changelog | Amber Brown | 2018-10-15 | 1 | -2/+1 | |
| | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #4049 from matrix-org/erikj/synctl_colour | Erik Johnston | 2018-10-18 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Newsfile | Erik Johnston | 2018-10-17 | 1 | -0/+1 | |
| * | | | | | | | | | Newsfile | Erik Johnston | 2018-10-17 | 1 | -0/+1 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 1 | -0/+1 | |
| * | | | | | | | | Merge pull request #4045 from matrix-org/rav/fix_get_missing_events | Richard van der Hoff | 2018-10-17 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 1 | -0/+1 | |
| | | |_|_|/ / / / | | |/| | | | | | | ||||||
| * / | | | | | | | changelog | Richard van der Hoff | 2018-10-16 | 1 | -0/+1 | |
| |/ / / / / / / | ||||||
| * / / / / / / | Various cleanups in the federation client code (#4031) | Richard van der Hoff | 2018-10-16 | 1 | -0/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Add changelog | David Baker | 2018-10-09 | 1 | -0/+1 | |
| * | | | | | | | synapse/app: frontend_proxy.py: actually make workers work on py3 | Ivan Shapovalov | 2018-10-14 | 1 | -0/+1 | |
| * | | | | | | | synapse/visibility.py: fix SyntaxError on py3.7 | Ivan Shapovalov | 2018-10-14 | 1 | -0/+1 | |
| | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Make workers work on Py3 (#4027) | Amber Brown | 2018-10-13 | 1 | -0/+1 | |
| * | | | | | | Update newsfile | Erik Johnston | 2018-10-10 | 1 | -1/+1 | |
| * | | | | | | Newsfile | Erik Johnston | 2018-10-09 | 1 | -0/+1 | |
| * | | | | | | Merge pull request #4008 from matrix-org/erikj/log_looping_exceptions | Erik Johnston | 2018-10-09 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Newsfile | Erik Johnston | 2018-10-05 | 1 | -0/+1 | |
| * | | | | | | Optimisation for filter_events_for_server | Richard van der Hoff | 2018-10-08 | 1 | -0/+1 | |
| |/ / / / / | ||||||
* | | | | | | Update changelog.d/3975.feature | Richard van der Hoff | 2018-10-24 | 1 | -1/+1 | |
* | | | | | | remove errant exception and style | Neil Johnson | 2018-10-23 | 1 | -1/+1 | |
* | | | | | | clean up config error logic and imports | Neil Johnson | 2018-10-17 | 1 | -1/+1 | |
* | | | | | | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 1 | -1/+1 | |
* | | | | | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 47 | -45/+4 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers | Richard van der Hoff | 2018-10-04 | 1 | -0/+1 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | fix newsfile name | Richard van der Hoff | 2018-10-03 | 1 | -0/+0 | |
| | * | | | | Fix bug in forward_extremity update logic | Richard van der Hoff | 2018-10-02 | 1 | -0/+1 | |
| * | | | | | Merge branch 'master' into develop | Amber Brown | 2018-10-04 | 59 | -61/+0 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | changelog v0.33.6 github/release-v0.33.6 release-v0.33.6 | Amber Brown | 2018-10-04 | 1 | -1/+0 | |
| | * | | | | Pin to prometheus_client<0.4 to avoid renaming all of our metrics | Richard van der Hoff | 2018-10-03 | 1 | -0/+1 | |
| | * | | | | changelog v0.33.6rc1 | Amber Brown | 2018-10-03 | 59 | -61/+0 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion | Erik Johnston | 2018-10-03 | 1 | -0/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration | Erik Johnston | 2018-10-03 | 1 | -0/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 | |
| | |/ / / | ||||||
| * / / / | Newsfile | Erik Johnston | 2018-10-03 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache | Erik Johnston | 2018-10-02 | 1 | -0/+1 | |
| |\ \ \ | ||||||
| | * | | | Newsfile | Erik Johnston | 2018-10-02 | 1 | -0/+1 | |
| * | | | | Remove Jenkins & other old dev junk (#3988) | Amber Brown | 2018-10-03 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-02 | 1 | -0/+1 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'develop' into rav/fix_missing_create_event_error | Richard van der Hoff | 2018-10-01 | 21 | -0/+21 | |
| | |\ \ \ | ||||||
| | * | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 | |
| * | | | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 1 | -0/+1 | |
| * | | | | | Newsfile | Erik Johnston | 2018-10-02 | 1 | -0/+1 | |
| * | | | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 1 | -0/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 1 | -0/+1 | |
| | | |/ / / | | |/| | | | ||||||
| * | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 1 | -0/+1 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Newsfile | Erik Johnston | 2018-10-01 | 1 | -0/+1 | |
| * | | | | | Update instructions to point to pip install (#3985) | Amber Brown | 2018-10-02 | 1 | -0/+1 | |
| * | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -0/+1 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 6 | -0/+6 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | changelog | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 | |
| * | | | | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 1 | -0/+1 | |
| | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #3933 from matrix-org/erikj/destination_retry_cache | Erik Johnston | 2018-10-01 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-28 | 14 | -0/+14 | |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | * | | | | | | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-26 | 2 | -0/+2 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-25 | 44 | -39/+4 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 | |
| * | | | | | | | | | Further reduce the size of the docker image (#3972) | Richard van der Hoff | 2018-10-01 | 1 | -0/+1 | |
| * | | | | | | | | | add --no-admin flag to registration script (#3836) | Bruno Windels | 2018-09-28 | 1 | -0/+1 | |
| * | | | | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 | |
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_call | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Remove redundant call to start_get_pdu_cache | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 | |
| | | |_|_|_|/ / / / | | |/| | | | | | | | ||||||
| * / | | | | | | | | build python 3 docker images on circle CI (#3976) | Jan Christian Grünhage | 2018-09-28 | 1 | -0/+1 | |
| |/ / / / / / / / | ||||||
* / / / / / / / / | changelog | Matthew Hodgson | 2018-09-29 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 80 | -27/+53 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 | |
* | | | | | | | | | | Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Do the changelog.d dance | Michael Kaye | 2018-09-27 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process | Amber Brown | 2018-09-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update 3970.bugfix | Amber Brown | 2018-09-27 | 1 | -1/+1 | |
| * | | | | | | | | | | Added changelog fragment | Schnuffle | 2018-09-27 | 1 | -0/+1 | |
* | | | | | | | | | | | Run our oldest supported configuration in CI (#3952) | Amber Brown | 2018-09-27 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | |