| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 1 | -0/+1 |
| | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent | ||||
| * | 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 |
| | | | | | | | | | * fix transaction wrapping bug that caused get_user_id_by_threepid_txn to fail * towncrier * white space | ||||
| * | Support m.login.sso (#4220) | Richard van der Hoff | 2018-11-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | * Clean up the CSS for the fallback login form I was finding this hard to work with, so simplify a bunch of things. Each flow is now a form inside a div of class login_flow. The login_flow class now has a fixed width, as that looks much better than each flow having a differnt width. * Support m.login.sso MSC1721 renames m.login.cas to m.login.sso. This implements the change (retaining support for m.login.cas for older clients). * changelog | ||||
| * | Check logcontexts before and after each test (#4190) | Richard van der Hoff | 2018-11-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | * Add better diagnostics to flakey keyring test * fix interpolation fail * Check logcontexts before and after each test * update changelog * update changelog | ||||
| * | 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 |
| | | | | | | | | | | | * Some words about garbage collections and logcontexts * Do a GC after each test to fix logcontext leaks This feels like an awful hack, but... * changelog | ||||
| * | Ignore __pycache__ directories in schema delta dir | Richard van der Hoff | 2018-11-20 | 1 | -0/+1 |
| | | | | | Now that we use py3, compiled python ends up in __pycache__ rather than *.pyc. | ||||
| * | Remove riot.im from the list of trusted Identity Servers in the default ↵ | Neil Johnson | 2018-11-20 | 1 | -0/+1 |
| | | | | | configuration (#4207) | ||||
| * | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 1 | -0/+1 |
| |\ | | | | | Fix some logcontext leaks | ||||
| | * | 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 a pull request template and add multiple issue templates | ||||
| | * | | Add changelog | Aaron Raimist | 2018-11-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * | | | Add changelog | Aaron Raimist | 2018-11-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * | | | Merge pull request #4193 from kivikakk/add-openbsd-prereq | Amber Brown | 2018-11-17 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | add jpeg to OpenBSD prereq list | ||||
| | * | | | 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 |
| |\ \ \ | | | | | | | | | Make e2e backup versions numeric in the DB | ||||
| | * \ \ | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2018-11-09 | 58 | -30/+29 |
| | |\ \ \ | | | | | | | | | | | | | | | | dbkr/e2e_backup_versions_are_numbers | ||||
| | * | | | | 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 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Drop incoming events from federation for unknown rooms | ||||
| | * | | | | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix noop checks when updating device keys | ||||
| | * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * port hash_password * changelog | ||||
| * | | | | Fix URL preview bugs (type error when loading cache from db, content-type ↵ | Amber Brown | 2018-11-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | including quotes) (#4157) | ||||
| * | | | | 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 | ||||
| | * | | | | add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/ | rubo77 | 2018-11-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ruben Barkow <github@r.z11.de> | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | So people can still collect consent the old way if they want to. | ||||
| * | | | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | fixes #4056 | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions. | ||||
| * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | Clean up event accesses and tests | ||||
| | * | | | | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix locked upsert on device_lists_remote_cache | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix logic error that prevented guests from seeing the privacy policy | ||||
| | * | | | | | | 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 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix None exception in state res v2 | ||||
| | * | | | | | | 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 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix build of Docker image with docker-compose | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Add m.login.terms to the registration flow | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add STATE_V2_TEST room version | ||||
| | * | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found these helpful in debugging my room upgrade tests. | ||||
| * | | | | | | | | | | | Merge pull request #4124 from matrix-org/rav/fix_tox | Richard van der Hoff | 2018-10-31 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to fix tox installs | ||||
| | * | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Delete unreferenced state groups during purge | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-26 | 20 | -0/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | erikj/purge_state_groups | ||||
| | * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-19 | 12 | -3/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/purge_state_groups | ||||
| | * | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of replication fixes for device lists | ||||
| | * | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 1 | -0/+1 |
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes handling of rooms where we have permission to send the tombstone, but not other state. We need to (a) fail more gracefully when we can't send the PLs in the old room, and (b) not set the PLs in the new room until we are done with the other stuff. | ||||
| * | | | | | | | | | | | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Room version upgrade support | ||||
| | * | | | | | | | | | | | 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 listen on ipv6 as well as ipv4 | ||||
| | * | | | | | | | | | | Make Docker image listening on ipv6 as well as ipv4 | Cédric Laudrel | 2018-10-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Cédric Laudrel <dek@iono.me> | ||||
| * | | | | | | | | | | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit. | ||||
| * | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add config option to control alias creation | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-25 | 16 | -0/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/alias_disallow_list | ||||
| | * | | | | | | | | | | | | 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 race condiftion in calling initialise_reserved_users | ||||
| | * | | | | | | | | | | | | 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 ↵ | Neil Johnson | 2018-10-25 | 26 | -4/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | matthew/autocreate_autojoin | ||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Richard van der Hoff | 2018-10-24 | 2 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rav/fix_event_filter_validation | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | 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 | ||||
| | | | * | | | | | | | | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broadly three things here: * disable W504 which seems a bit whacko * remove a bunch of `as e` expressions from exception handlers that don't use them * use `r""` for strings which include backslashes Also, we don't use pep8 any more, so we can get rid of the duplicate config there. | ||||
| | | * | | | | | | | | | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | Add v2 state resolution algorithm | ||||
| | | | * | | | | | | | | | | | | 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 |
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783 which meant that single backslashes were not allowed in event field filters. The intention here is to allow single-backslashes, but disallow double-backslashes. | ||||
| | * | | | | | | | | | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the way logcontexts and threads work in the pushers | ||||
| | | * | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | Clean up room alias creation | ||||
| | | * | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle HttpResponseException more safely for federated groups | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap calls to deferToThread() in a thing which uses a child logcontext to attribute CPU usage to the right request. While we're in the area, remove the logcontext_tracer stuff, which is never used, and afaik doesn't work. Fixes #4064 | ||||
| | * | | | | | | | | | | | | | | 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 | ||||
| | | * | | | | | | | | | | | | | Add information about the matrix-docker-ansible-deploy playbook | Slavi Pantaleev | 2018-10-14 | 1 | -0/+1 |
| | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Slavi Pantaleev <slavi@devture.com> | ||||
| | * | | | | | | | | | | | | | 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 | ||||
| | | * | | | | | | | | | | | | | Run MAU queries as background processes | Richard van der Hoff | 2018-10-20 | 1 | -0/+1 |
| | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3820 | ||||
| | * | | | | | | | | | | | | | 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 | ||||
| | | * | | | | | | | | | | | | | Make psutil an explicit dependency | Richard van der Hoff | 2018-10-19 | 1 | -0/+1 |
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of #4027, we require psutil to be installed, so it should be in our dependency list. We can also remove some of the conditional import code introduced by #992. Fixes #4062. | ||||
| | * / / / / / / / / / / / / | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase ↵ | Amber Brown | 2018-10-20 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on py3) (#4068) | ||||
| | * | | | | | | | | | | | | 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 | ||||
| | | * | | | | | | | | | | | 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 |
| | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should use the same python to start the workers as we do for the main synapse (ie, the same one used to run synctl.) | ||||
| | * | | | | | | | | | remove redundant changelog file | Richard van der Hoff | 2018-10-18 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this change has been released | ||||
| | * | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id. | ||||
| | | * | | | | | | | | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the example email templates into the synapse package so that they can be used as package data, which should mean that all of the packaging mechanisms (pip, docker, debian, arch, etc) should now come with the example templates. In order to grandfather in people who relied on the templates being in the old place, check for that situation and fall back to using the defaults if the templates directory does not exist. | ||||
| | | * | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Only colourise synctl output when attached to tty | ||||
| | | * | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @Half-Shot !!! | ||||
| | * | | | | | | | | 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 | ||||
| | | * | | | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 1 | -0/+1 |
| | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id. | ||||
| | * / | | | | | | | 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 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve logging: log things in the right order, include destination and txids in all log lines, don't log successful responses twice - Fix the docstring on TransportLayerClient.send_transaction - Don't use treq.request, which is overcomplicated for our purposes: just use a twisted.web.client.Agent. - simplify the logic for setting up the bodyProducer - fix bytes/str confusions | ||||
| | * | | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | E2E backups | ||||
| | | * | | | | | | 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 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Log looping call exceptions | ||||
| | | * | | | | | 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 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're better off hashing just the event_id than the whole ((type, state_key), event_id) tuple - so use a dict instead of a set. Also, iteritems > items. | ||||
| * | | | | | | Update changelog.d/3975.feature | Richard van der Hoff | 2018-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Co-Authored-By: neilisfragile <neil@matrix.org> | ||||
| * | | | | | | 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 bug in forward_extremity update logic | ||||
| | | * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An event does not stop being a forward_extremity just because an outlier or rejected event refers to it. | ||||
| | * | | | | | 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 |
| | |\ \ \ \ | | | | | | | | | | | | | Fix handling of rejected threepid invites | ||||
| | | * | | | | 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 |
| | |\ \ \ \ | | | | | | | | | | | | | Fix exception in background metrics collection | ||||
| | | * | | | | 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 |
| | |\ \ \ | | | | | | | | | | | Fix bug when invalidating destination retry timings | ||||
| | | * | | | 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 |
| | |\ \ \ | | | | | | | | | | | Fix error handling for missing auth_event | ||||
| | | * \ \ | 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 | ||||
| | | * | | | | | 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 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix lazy loaded sync with rejected state events | ||||
| | | * | | | | 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 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fix exceptions when handling incoming transactions | ||||
| | | * \ \ \ \ | 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 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add a five minute cache to get_destination_retry_timings | ||||
| | | * \ \ \ \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the dockerfile as a multistage build: this means we can get rid of a whole load of cruft which we don't need. | ||||
| | * | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | remove spurious federation checks on localhost | ||||
| | | * | | | | | | | | | 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 | ||||
| | | * | | | | | | | | | Remove redundant call to start_get_pdu_cache | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 |
| | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think this got forgotten in #3932. We were getting away with it because it was the last call in this function. | ||||
| | * / | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improve performance of getting typing updates for replication | ||||
| | * \ \ \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Build and push docker image to hub automatically | ||||
| | * | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | Clarifications in FederationHandler | ||||
| | * | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Run notify_app_services as a bg process | ||||
| | * | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Replaced all occurences of e.message with str(e) | ||||
| | * | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | fix #3854 MAU transaction errors | ||||
| | * | | | | | | | | | | towncrier | Neil Johnson | 2018-09-26 | 1 | -0/+1 |
| | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Logging improvements | ||||
| | * | | | | | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some logging tweaks to help with debugging incoming federation transactions | ||||
| * | | | | | | | | | | Include eventid in log lines when processing incoming federation ↵ | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions (#3959) when processing incoming transactions, it can be hard to see what's going on, because we process a bunch of stuff in parallel, and because we may end up recursively working our way through a chain of three or four events. This commit creates a way to use logcontexts to add the relevant event ids to the log lines. | ||||
| * | | | | | | | | | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 |
| | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | I spent ages trying to figure out how I was going mad... | ||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
| * / / / / / / / | Reduce the load on our CI (#3957) | Amber Brown | 2018-09-27 | 1 | -0/+1 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changelog * reduce circleci config * plus a handy script * fix regex | ||||
| * | | | | | | | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Fix ExpiringCache.__len__ to be accurate | ||||
| | * | | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctl | Amber Brown | 2018-09-26 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move synctl into top dir to avoid a symlink | ||||
| | * | | | | | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Comments and interface cleanup for on_receive_pdu | ||||
| | * | | | | | | | changelog | Richard van der Hoff | 2018-09-20 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3 | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | make python 3 work in the docker container | ||||
| | * | | | | | | | add changelog | Jan Christian Grünhage | 2018-09-20 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | Fix some instances of ExpiringCache not expiring cache items | ||||
| | * | | | | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | added "media-src: 'self'" to CSP for resources (#3578) | Jérémy Farnaud | 2018-09-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse doesn’t allow for media resources to be played directly from Chrome. It is a problem for users on other networks (e.g. IRC) communicating with Matrix users through a gateway. The gateway sends them the raw URL for the resource when a Matrix user uploads a video and the video cannot be played directly in Chrome using that URL. Chrome argues it is not authorized to play the video because of the Content Security Policy. Chrome checks for the "media-src" policy which is missing, and defauts to the "default-src" policy which is "none". As Synapse already sends "object-src: 'self'" I thought it wouldn’t be a problem to add "media-src: 'self'" to the CSP to fix this problem. | ||||
| * | | | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix spurious exceptions when client closes conncetion | ||||
| | * | | | | | | | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Given we have disabled lazy loading for incr syncs in #3840, we can make self-LL more efficient by only doing it on initial sync. Also adds a bounds check for if/when we change our mind, so that we don't try to include LL members on sync responses with no timeline. | ||||
| * | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-24 | 40 | -39/+0 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errors | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Handle exceptions thrown by background tasks | ||||
| | * | | | | | | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 1 | -0/+1 |
| | |_|/ / / / |/| | | | | | | | | | | | | | | | | | Should fix https://github.com/vector-im/riot-web/issues/7209 | ||||
| * | | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links | Neil Johnson | 2018-09-20 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Neilj/fix room invite mail links | ||||
| | * | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Richard van der Hoff | 2018-09-18 | 13 | -0/+12 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/fix_room_invite_mail_links | ||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |