Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 1 | -0/+1 |
|\ | |||||
| * | move guard out of is_threepid_reserved and into register.py | Neil Johnson | 2019-01-22 | 1 | -1/+1 |
| * | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -0/+1 |
* | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_doc | Neil Johnson | 2019-01-24 | 1 | -0/+1 |
|\ \ | |||||
| * | | Changelog | David Baker | 2019-01-24 | 1 | -0/+1 |
* | | | Fix UPSERT check (#4459) | Amber Brown | 2019-01-24 | 1 | -0/+1 |
|/ / | |||||
* | | Use native UPSERTs where possible (#4306) | Amber Brown | 2019-01-24 | 1 | -0/+1 |
* | | Don't send IP addresses as SNI (#4452) | Richard van der Hoff | 2019-01-24 | 1 | -0/+1 |
* | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backport | Andrew Morgan | 2019-01-23 | 1 | -0/+1 |
|\ \ | |||||
| * | | Add changelog | Andrew Morgan | 2019-01-23 | 1 | -0/+1 |
* | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agent | Richard van der Hoff | 2019-01-23 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | changelog | Richard van der Hoff | 2019-01-22 | 1 | -0/+1 |
* | | | debian package: symlink to python-3.X (#4433) | Richard van der Hoff | 2019-01-23 | 1 | -0/+1 |
* | | | Fixup removal of duplicate `user_ips` rows (#4432) | Erik Johnston | 2019-01-23 | 1 | -0/+1 |
* | | | Support ACME for certificate provisioning (#4384) | Amber Brown | 2019-01-23 | 1 | -0/+1 |
* | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedup | Erik Johnston | 2019-01-22 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Newsfile | Erik Johnston | 2019-01-22 | 1 | -0/+1 |
* | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration | Neil Johnson | 2019-01-22 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Config option to disable requesting MSISDN on registration | Neil Johnson | 2019-01-21 | 1 | -0/+1 |
* | | | Make key fetches use regular federation client (#4426) | Richard van der Hoff | 2019-01-22 | 1 | -0/+1 |
* | | | Refactor and bugfix for resove_service (#4427) | Richard van der Hoff | 2019-01-22 | 1 | -0/+1 |
* | | | Require ECDH key exchange & remove dh_params (#4429) | Amber Brown | 2019-01-22 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv... | Erik Johnston | 2019-01-21 | 10 | -0/+10 |
|\| | |||||
| * | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis | Erik Johnston | 2019-01-21 | 1 | -0/+1 |
| |\ | |||||
| * | | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 1 | -0/+1 |
| * | | Fix race when persisting create event (#4404) | Erik Johnston | 2019-01-18 | 1 | -0/+1 |
| * | | Tweak code coverage settings (#4400) | Erik Johnston | 2019-01-18 | 1 | -0/+1 |
| * | | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 1 | -0/+1 |
| * | | Fix incorrect logcontexts after a Deferred was cancelled (#4407) | Richard van der Hoff | 2019-01-17 | 1 | -0/+1 |
| * | | sign_request -> build_auth_headers (#4408) | Richard van der Hoff | 2019-01-17 | 1 | -0/+1 |
| * | | Changing macaroon_secret_key no longer logs you out (#4387) | Richard van der Hoff | 2019-01-16 | 1 | -0/+1 |
| * | | don't store more remote device lists if they have more than 1K devices (#4397) | Richard van der Hoff | 2019-01-16 | 1 | -0/+1 |
| * | | Add a changelog entry | Andrej Shadura | 2019-01-16 | 1 | -0/+1 |
| * | | ALL_USER_TYPES should be a tuple | Neil Johnson | 2019-01-15 | 1 | -0/+1 |
* | | | Newsfile | Erik Johnston | 2019-01-16 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Newsfile | Erik Johnston | 2019-01-15 | 1 | -0/+1 |
|/ | |||||
* | Silence travis-ci build warnings by removing non-functional python3.6 (#4377) | Richard van der Hoff | 2019-01-12 | 1 | -0/+1 |
* | Remove duplicates in the user_ips table and add an index (#4370) | Amber Brown | 2019-01-12 | 1 | -0/+1 |
* | Merge pull request #4342 from aaronraimist/new-virtualenv | Richard van der Hoff | 2019-01-10 | 1 | -0/+1 |
|\ | |||||
| * | Add changelog | Aaron Raimist | 2019-01-01 | 1 | -0/+1 |
* | | Merge branch 'master' into develop | Richard van der Hoff | 2019-01-09 | 42 | -43/+0 |
|\ \ | |||||
| * | | 0.34.1 v0.34.1 | Richard van der Hoff | 2019-01-09 | 2 | -2/+0 |
| * | | Merge branch 'develop' into release-v0.34.1 | Erik Johnston | 2019-01-09 | 2 | -0/+2 |
| |\ \ | |||||
| * | | | changelog | Richard van der Hoff | 2019-01-08 | 40 | -41/+0 |
* | | | | Merge pull request #4368 from matrix-org/erikj/better_errors | Erik Johnston | 2019-01-09 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2019-01-09 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
* / | | | Fix adding new rows instead of updating them if one of the key values is a NU... | Amber Brown | 2019-01-09 | 1 | -0/+1 |
|/ / / | |||||
* | | | Newsfile | Erik Johnston | 2019-01-08 | 1 | -0/+1 |
* | | | Newsfile | Erik Johnston | 2019-01-08 | 1 | -0/+1 |
|/ / | |||||
* | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 1 | -0/+1 |
* | | Fix synapse.config.__main__ on python 3 (#4356) | Amber Brown | 2019-01-08 | 1 | -0/+1 |
* | | Fix command hint to generate a config file (#4353) | Jason Robinson | 2019-01-07 | 1 | -0/+1 |
* | | Add GET account data routes (#4303) | Travis Ralston | 2019-01-07 | 1 | -0/+1 |
* | | Check jinja version for consent resource (#4327) | Richard van der Hoff | 2019-01-07 | 1 | -0/+1 |
* | | fix the check for whether `is_url` to match all the other ones in codebase (#... | Michael Telatynski | 2019-01-06 | 1 | -0/+1 |
* | | Update debian Conflicts specifications (#4349) | Richard van der Hoff | 2019-01-04 | 1 | -0/+1 |
* | | fix NPE in /messages by checking if all events were filtered out (#4330) | Matthew Hodgson | 2019-01-02 | 1 | -0/+1 |
* | | Update README to not lie about required restart (#4343) | Aaron Raimist | 2019-01-02 | 1 | -0/+1 |
* | | Ensure synchrotrons can access is_support_user in the storage layer | Neil Johnson | 2019-01-02 | 1 | -0/+1 |
* | | Update PR template to use absolute links (#4341) | Aaron Raimist | 2019-01-02 | 1 | -0/+1 |
* | | Avoid packaging _trial_temp directory (#4326) | Richard van der Hoff | 2019-01-02 | 1 | -0/+2 |
* | | Install the optional dependencies into the debian package (#4325) | Richard van der Hoff | 2019-01-02 | 1 | -0/+1 |
|/ | |||||
* | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 1 | -0/+1 |
* | Remove mention of lt-cred-mech in the sample coturn config. (#4333) | Krithin Sitaram | 2018-12-28 | 1 | -0/+1 |
* | Log roomid along with Unknown room (#4297) | Will Hunt | 2018-12-24 | 1 | -0/+1 |
* | Merge pull request #4307 from matrix-org/erikj/v2_rooms | Richard van der Hoff | 2018-12-24 | 1 | -0/+1 |
|\ | |||||
| * | Newsfile | Erik Johnston | 2018-12-18 | 1 | -0/+1 |
* | | Return well_known in /login response (#4319) | Richard van der Hoff | 2018-12-24 | 1 | -0/+1 |
* | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5 | Richard van der Hoff | 2018-12-23 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fix test_metrics.py compatibility prometheus_client 0.5 | Maarten de Vries | 2018-12-21 | 1 | -0/+1 |
* | | | Merge pull request #4316 from matrix-org/rav/fix_docker_upload | Richard van der Hoff | 2018-12-21 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Fix circleci config for synapse:latest docker upload | Richard van der Hoff | 2018-12-21 | 1 | -0/+1 |
| |/ / | |||||
* | | | Add a script to generate a clean config file (#4315) | Richard van der Hoff | 2018-12-22 | 1 | -0/+1 |
* | | | Fix indentation in default config (#4313) | Richard van der Hoff | 2018-12-22 | 1 | -0/+1 |
* | | | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 1 | -0/+1 |
* | | | Make the dependencies more like a standard Python project and hook up the opt... | Amber Brown | 2018-12-22 | 1 | -0/+1 |
|/ / | |||||
* | | Create 4309.bugfix | Nathan Pennie | 2018-12-19 | 1 | -0/+1 |
* | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305) | Neil Johnson | 2018-12-18 | 1 | -0/+1 |
* | | create support user (#4141) | Neil Johnson | 2018-12-14 | 1 | -0/+1 |
* | | Settings Fix deleting e2e room keys on xenial (#4295) | Amber Brown | 2018-12-14 | 1 | -0/+1 |
* | | Improved welcome page (#4294) | Nad Chishtie | 2018-12-14 | 1 | -0/+1 |
* | | Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_link | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
|\ \ | |||||
| * | | changelog | Michael Kaye | 2018-12-07 | 1 | -0/+1 |
* | | | Merge branch 'release-v0.34.0' into develop | Richard van der Hoff | 2018-12-11 | 34 | -36/+0 |
|\ \ \ | |||||
| * | | | 0.34.0rc2 v0.34.0rc2 | Richard van der Hoff | 2018-12-11 | 3 | -3/+0 |
| * | | | remove changelog files | Richard van der Hoff | 2018-12-11 | 34 | -36/+0 |
| * | | | Merge pull request #4290 from matrix-org/rav/remove_webclient | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Stop installing Matrix Console by default | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
| * | | | | Merge branch 'rav/disable_pager_in_ci' into rav/welcome_page | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | Disable pager for ci script | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
| | |/ / / | |||||
| * / / / | Add a welcome page to the static resources | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-11 | 1 | -0/+1 |
* | | | | 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 |
| |/ / / / / / / / / / / / |