| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Collapse changelog to one line | Jason Robinson | 2019-01-23 | 1 | -13/+1 |
| | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | Add changelog for openid resource addition | Jason Robinson | 2019-01-23 | 1 | -0/+13 |
| | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedup | Erik Johnston | 2019-01-22 | 1 | -0/+1 |
| |\ | | | | | Fix bug when removing duplicate rows from user_ips | ||||
| | * | 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 | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | All this magic is redundant. | ||||
| * | | | 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 |
| | |/ |/| | | | * remove dh_params and set better cipher string | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-21 | 10 | -0/+10 |
| |\| | | | | | | | erikj/fed_v2_invite_server | ||||
| | * | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis | Erik Johnston | 2019-01-21 | 1 | -0/+1 |
| | |\ | | | | | | | Add groundwork for new versions of federation APIs | ||||
| | * | | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate encryption state on room upgrade Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> * Add changelog file | ||||
| | * | | Fix race when persisting create event (#4404) | Erik Johnston | 2019-01-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix race when persisting create event When persisting a chunk of DAG it is sometimes requried to do a state resolution, which requires knowledge of the room version. If this happens while we're persisting the create event then we need to use that event rather than attempting to look it up in the database. | ||||
| | * | | Tweak code coverage settings (#4400) | Erik Johnston | 2019-01-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Tweak code coverage settings * Fix manifest * Newsfile * Fix commit status? | ||||
| | * | | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant WrappedConnection The matrix federation client uses an HTTP connection pool, which times out its idle HTTP connections, so there is no need for any of this business. | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | Just got very confused about the fact that the headers are only an output, not an input. | ||||
| | * | | 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 |
| | | | | | | | | | | | | | Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk> | ||||
| | * | | 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 non-functional python3.6 in travis env * changelog | ||||
| * | 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 |
| |\ | | | | | Update README to use new virtualenv (#4328) | ||||
| | * | Add changelog | Aaron Raimist | 2019-01-01 | 1 | -0/+1 |
| | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * | | 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 |
| |\ \ \ \ | | | | | | | | | | | Fixup docstrings for matrixfederationclient | ||||
| | * | | | | 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 ↵ | Amber Brown | 2019-01-09 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | NULL in upserts. (#4369) | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Correctly retry and back off if we get a HTTPerror response * Refactor request sending to have better excpetions MatrixFederationHttpClient blindly reraised exceptions to the caller without differentiating "expected" failures (e.g. connection timeouts etc) versus more severe problems (e.g. programming errors). This commit adds a RequestSendFailed exception that is raised when "expected" failures happen, allowing the TransactionQueue to log them as warnings while allowing us to log other exceptions as actual exceptions. | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix command hint to generate a config file When trying to start Synapse without a config file, it will complain and give a hint towards what command to run. This hinted command is missing the "report_stats" parameter, which is required with either yes or no value. Add this to the command. Not an ideal situation but makes the given command work without the user getting another error, even though it might be unclear what "report_stats" represents. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | | Add GET account data routes (#4303) | Travis Ralston | 2019-01-07 | 1 | -0/+1 |
| | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1339 | ||||
| * | | Check jinja version for consent resource (#4327) | Richard van der Hoff | 2019-01-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | * Raise a ConfigError if an invalid resource is specified * Require Jinja 2.9 for the consent resource * changelog | ||||
| * | | fix the check for whether `is_url` to match all the other ones in codebase ↵ | Michael Telatynski | 2019-01-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | (#3405) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | ||||
| * | | Update debian Conflicts specifications (#4349) | Richard van der Hoff | 2019-01-04 | 1 | -0/+1 |
| | | | | | | | ... to allow installation alongside our matrix-synapse transitional package. | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | * Update README to not lie about required restart Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | * Update PR template to use absolute links Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * | | Avoid packaging _trial_temp directory (#4326) | Richard van der Hoff | 2019-01-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | Make sure we don't put the _trial_temp directory in the package target directory. Fixes https://github.com/matrix-org/synapse/issues/4322 | ||||
| * | | Install the optional dependencies into the debian package (#4325) | Richard van der Hoff | 2019-01-02 | 1 | -0/+1 |
| |/ | | | | | | | | since #4298, the optional dependencies are no longer installed with a simple `pip install .`, which meant that they were not being included in the debian package. The easy fix to that is dh_virtualenv --extras, but that needs dh_virtualenv 1.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 |
| | | | | | | | | | | | | * Remove mention of lt-cred-mech in the sample coturn config. See https://github.com/coturn/coturn/pull/262 for more context. Also clean up some minor formatting issues while I'm here. * Add changelog. Signed-off-by: Krithin Sitaram <krithin@gmail.com> | ||||
| * | 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 |
| |\ | | | | | Add v2 room version | ||||
| | * | 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 |
| | | | | | | | | | ... as per MSC1730. | ||||
| * | | 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 | ||||
| | * | | Fix test_metrics.py compatibility prometheus_client 0.5 | Maarten de Vries | 2018-12-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | prometheus_client 0.5 has a named-tuple Sample type with more member than the old plain tuple had. This commit makes sure the unit test detects this and changes the way it reads the sample. Signed-off-by: Maarten de Vries <maarten@de-vri.es> | ||||
| * | | | 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 | ||||
| | * | | | Fix circleci config for synapse:latest docker upload | Richard van der Hoff | 2018-12-21 | 1 | -0/+1 |
| | |/ / | | | | | | | | | | Give the image the right tag, so that we can push it. | ||||
| * | | | 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 |
| | | | | | | | | | | These settings are not supposed to be under 'listeners'. | ||||
| * | | | 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 ↵ | Amber Brown | 2018-12-22 | 1 | -0/+1 |
| |/ / | | | | | | | optional dependencies to setuptools (#4298) | ||||
| * | | 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 |
| | | | | | | | * ensure can report mau stats when hs.config.mau_stats_only is set | ||||
| * | | create support user (#4141) | Neil Johnson | 2018-12-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits. | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar. | ||||
| * | | Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_link | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
| |\ \ | | | | | | | Update link to kernel.org DCO usage | ||||
| | * | | 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 | ||||
| | | * | | | Stop installing Matrix Console by default | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | This is based on the work done by @krombel in #2601. | ||||
| | * | | | | 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 |
| | | |/ / / | | | | | | | | | | | | | | | | ... otherwise it hangs | ||||
| | * / / / | Add a welcome page to the static resources | Richard van der Hoff | 2018-12-11 | 1 | -0/+1 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601. | ||||
| * | | | | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog | ||||
| * | | | | Merge pull request #4279 from matrix-org/hs/fix-config-cors | Will Hunt | 2018-12-10 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Make /config more CORS-y | ||||
| | * | | | | 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 |
| | | | | | | | | | | | | | | | | When we register a new user from SAML2 data, initialise their displayname correctly. | ||||
| * | | | Update the example systemd config to use a virtualenv (#4273) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | If you're installing as a system package, the system package should have set up the systemd config, so it's more useful to give an example of running in a virtualenv here. | ||||
| * | | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements both a SAML2 metadata endpoint (at `/_matrix/saml2/metadata.xml`), and a SAML2 response receiver (at `/_matrix/saml2/authn_response`). If the SAML2 response matches what's been configured, we complete the SSO login flow by redirecting to the client url (aka `RelayState` in SAML2 jargon) with a login token. What we don't yet have is anything to build a SAML2 request and redirect the user to the identity provider. That is left as an exercise for the reader. | ||||
| * | | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | This is mostly factoring out the post-CAS-login code to somewhere we can reuse it for other SSO flows, but it also fixes the userid mapping while we're at it. | ||||
| * | | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rip out half-implemented m.login.saml2 support This was implemented in an odd way that left most of the work to the client, in a way that I really didn't understand. It's going to be a pain to maintain, so let's start by ripping it out. * drop undocumented dependency on dateutil It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat. | ||||
| * | | | drop undocumented dependency on dateutil (#4266) | Richard van der Hoff | 2018-12-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat. | ||||
| * | | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 1 | -0/+1 |
| |/ / | | | | | | | Sometimes it's useful for synapse to generate its own .well-known file. | ||||
| * | | 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. | ||||
| | * | | 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 |
| |/ / | | | | | | | These aren't used, because we have a `log_config` setting. | ||||
| * | | 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 ↵ | Travis Ralston | 2018-12-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | in it (#4230) This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data. | ||||
| * | | Add note to UPGRADE.rst about removing riot.im from list of trusted identity ↵ | Aaron Raimist | 2018-12-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | servers (#4224) * Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * | | 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 |
| | | | | | | | | | This is a bit of a half-assed effort at fixing https://github.com/matrix-org/synapse/issues/4252. Fundamentally the right answer is to drop support for Python 2. | ||||
| * | | Merge pull request #4244 from aaronraimist/drop-sent-txt | Richard van der Hoff | 2018-12-04 | 1 | -0/+1 |
| |\ \ | | | | | | | Drop sent_transactions | ||||
| | * | | Add changelog | Aaron Raimist | 2018-12-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * | | | 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 |
| |\ \ \ | | | | | | | | | Fix removing pushers on python 3 | ||||
| | * | | | 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 | ||||
| | * | | | | Add a basic .editorconfig | Aaron Raimist | 2018-12-03 | 1 | -0/+1 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * / / / | Run the AS senders as background processes (#4189) | Richard van der Hoff | 2018-12-04 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | This should fix some "Starting db connection from sentinel context" warnings, and will mean we get metrics for these processes. | ||||
| * / / | Workaround for non-ascii event ids (#4241) | Richard van der Hoff | 2018-12-03 | 1 | -0/+1 |
| |/ / | | | | | | | | | | | It turns out that we accept events with non-ascii IDs, which would later cause an explosion during state res. Fixes #4226 | ||||
| * | | 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 |
| | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |