Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixup | Erik Johnston | 2019-02-18 | 1 | -0/+1 |
| | |||||
* | fix missig import | Matthew Hodgson | 2019-02-18 | 1 | -0/+1 |
| | |||||
* | tabs | Matthew Hodgson | 2019-02-14 | 1 | -1/+1 |
| | |||||
* | set CORS on .well-known URI to unbreak modular | Matthew Hodgson | 2019-02-14 | 1 | -0/+1 |
| | | | | | otherwise a riot/web running on foo.riot.im can't query the .well-known on foo.modular.im... | ||||
* | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updating | Erik Johnston | 2019-02-11 | 1 | -0/+34 |
|\ | | | | | add updating of backup versions | ||||
| * | make sure version is in body and wrap in linearizer queue | Hubert Chathi | 2019-02-08 | 1 | -1/+2 |
| | | | | | | | | also add tests | ||||
| * | add new endpoint to update backup versions | Hubert Chathi | 2019-02-06 | 1 | -0/+33 |
| | | |||||
* | | Allow "unavailable" presence status for /sync (#4592) | Valentin Anger | 2019-02-08 | 2 | -1/+2 |
|/ | | | | | | | | | | * Allow "unavailable" presence status for /sync Closes #3772, closes #3779 Signed-off-by: Valentin Anger <valentin.an.1999@gmail.com> * Add changelog for PR 4592 | ||||
* | Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2019-01-30 | 2 | -14/+5 |
|\ | | | | | | | neilj/room_capabilities | ||||
| * | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 2 | -14/+5 |
| |\ | |||||
| | * | Check consent dir path on startup | Andrew Morgan | 2019-01-29 | 1 | -10/+1 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-25 | 1 | -13/+10 |
| | |\ | | | | | | | | | | | | | anoa/dm_room_upgrade | ||||
| | * | | Fix typos | Andrew Morgan | 2019-01-22 | 1 | -4/+4 |
| | | | | |||||
* | | | | isort | Neil Johnson | 2019-01-30 | 1 | -2/+1 |
|/ / / | |||||
* | | | formatting and use constants where available | Neil Johnson | 2019-01-30 | 1 | -19/+17 |
| | | | |||||
* | | | Populate default room version from Constants | Neil Johnson | 2019-01-30 | 1 | -1/+2 |
| | | | |||||
* | | | reflect that rooms v3 is a stable room version | Neil Johnson | 2019-01-30 | 1 | -0/+1 |
| | | | |||||
* | | | rework format of change password capability | Neil Johnson | 2019-01-29 | 1 | -1/+3 |
| | | | |||||
* | | | support change_password in capabilities end-point | Neil Johnson | 2019-01-29 | 1 | -2/+12 |
| | | | |||||
* | | | enforce auth for capabilities endpoint | Neil Johnson | 2019-01-29 | 1 | -10/+17 |
| | | | |||||
* | | | register capabilities servlet | Neil Johnson | 2019-01-29 | 1 | -0/+2 |
| | | | |||||
* | | | backout v3 | Neil Johnson | 2019-01-25 | 1 | -1/+0 |
| | | | |||||
* | | | Support room version capabilities in CS API (MSC1804) | Neil Johnson | 2019-01-25 | 1 | -0/+49 |
| |/ |/| | |||||
* | | move guard out of is_threepid_reserved and into register.py | Neil Johnson | 2019-01-22 | 1 | -4/+5 |
| | | |||||
* | | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -1/+3 |
| | | |||||
* | | Config option to disable requesting MSISDN on registration | Neil Johnson | 2019-01-21 | 1 | -11/+5 |
|/ | |||||
* | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 1 | -3/+4 |
| | | | | | | | | | | | | | | * 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. | ||||
* | Add GET account data routes (#4303) | Travis Ralston | 2019-01-07 | 1 | -1/+33 |
| | | | | As per https://github.com/matrix-org/matrix-doc/issues/1339 | ||||
* | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 4 | -445/+0 |
| | |||||
* | Return well_known in /login response (#4319) | Richard van der Hoff | 2018-12-24 | 1 | -7/+11 |
| | | | | ... as per MSC1730. | ||||
* | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 1 | -2/+12 |
| | |||||
* | create support user (#4141) | Neil Johnson | 2018-12-14 | 1 | -1/+10 |
| | | | | | | 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. | ||||
* | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-11 | 1 | -1/+2 |
| | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog | ||||
* | Move imports to one line | Will Hunt | 2018-12-10 | 1 | -4/+1 |
| | |||||
* | Use `send_cors` | Will Hunt | 2018-12-10 | 1 | -4/+1 |
| | |||||
* | changelog & isort | Will Hunt | 2018-12-09 | 1 | -1/+5 |
| | |||||
* | Make /config more CORS-y | Will Hunt | 2018-12-09 | 1 | -1/+3 |
| | |||||
* | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 2 | -0/+8 |
| | | | | | When we register a new user from SAML2 data, initialise their displayname correctly. | ||||
* | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 3 | -0/+136 |
| | | | | | | | | | | | 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 | -29/+76 |
| | | | | 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 | -67/+2 |
| | | | | | | | | | | | | | * 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. | ||||
* | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 1 | -0/+70 |
| | | | | Sometimes it's useful for synapse to generate its own .well-known file. | ||||
* | Fix non-ASCII pushrules (#4248) | Amber Brown | 2018-12-04 | 1 | -12/+23 |
| | |||||
* | fix type error | Amber Brown | 2018-12-03 | 1 | -1/+1 |
| | |||||
* | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 2 | -0/+3 |
| | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent | ||||
* | Support m.login.sso (#4220) | Richard van der Hoff | 2018-11-27 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | * 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 | ||||
* | Fix fallback auth on Python 3 (#4197) | Amber Brown | 2018-11-19 | 1 | -22/+16 |
| | |||||
* | Remove duplicate slashes in generated consent URLs | Travis Ralston | 2018-11-15 | 1 | -2/+2 |
| | |||||
* | Fix Content-Disposition in media repository (#4176) | Amber Brown | 2018-11-15 | 3 | -90/+110 |
| | |||||
* | Use <meta> tags to discover the per-page encoding of html previews (#4183) | Amber Brown | 2018-11-15 | 1 | -9/+22 |
| | |||||
* | Add a test for the public T&Cs form | Richard van der Hoff | 2018-11-14 | 1 | -1/+1 |
| | |||||
* | Fix an internal server error when viewing the public privacy policy | Richard van der Hoff | 2018-11-14 | 1 | -4/+7 |
| | |||||
* | Fix encoding error for consent form on python3 | hera | 2018-11-08 | 1 | -1/+3 |
| | | | | | | The form was rendering this as "b'01234....'". -- richvdh | ||||
* | Fix URL preview bugs (type error when loading cache from db, content-type ↵ | Amber Brown | 2018-11-08 | 1 | -6/+16 |
| | | | | including quotes) (#4157) | ||||
* | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 2 | -2/+2 |
| | | | | 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 | -3/+18 |
| | | | fixes #4056 | ||||
* | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 1 | -1/+1 |
| | |||||
* | Fix logic error that prevented guests from seeing the privacy policy | Travis Ralston | 2018-11-01 | 1 | -1/+1 |
| | |||||
* | Include a version query string arg for the consent route | Travis Ralston | 2018-10-31 | 1 | -2/+4 |
| | |||||
* | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 7 | -177/+93 |
|\ | |||||
| * | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 2 | -106/+0 |
| | | |||||
| * | Delete the disused & unspecced identicon functionality (#4106) | Amber Brown | 2018-10-29 | 2 | -70/+0 |
| | | |||||
| * | Address review comments | Richard van der Hoff | 2018-10-26 | 1 | -5/+16 |
| | | | | | | | | Improve comments, get old room state from the context we already have | ||||
| * | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 2 | -0/+80 |
| | | | | | | | | | | Currently just creates a new, empty, room, and sends a tombstone in the old room. | ||||
| * | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | 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 branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 6 | -49/+30 |
|\| | |||||
| * | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 1 | -32/+5 |
| |\ | | | | | | | Clean up room alias creation | ||||
| | * | Clean up room alias creation | Erik Johnston | 2018-10-19 | 1 | -32/+5 |
| | | | |||||
| * | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 3 | -15/+23 |
| |/ | | | | | | | | | | | | | | | | | | | 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 branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 1 | -2/+5 |
|\| | |||||
| * | Fix bug where we raised StopIteration in a generator | Erik Johnston | 2018-10-17 | 1 | -2/+5 |
| | | | | | | | | This made python 3.7 unhappy | ||||
* | | pep8 | Travis Ralston | 2018-10-15 | 2 | -13/+2 |
| | | |||||
* | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-15 | 2 | -0/+374 |
|\| | |||||
| * | missed one | David Baker | 2018-10-12 | 1 | -0/+1 |
| | | |||||
| * | Don't mangle exceptions | David Baker | 2018-10-12 | 1 | -4/+2 |
| | | |||||
| * | Split /room_keys/version into 2 servlets | David Baker | 2018-10-12 | 1 | -9/+21 |
| | | |||||
| * | PR feedback pt. 1 | David Baker | 2018-10-12 | 1 | -1/+1 |
| | | |||||
| * | isort | David Baker | 2018-10-09 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 21 | -123/+197 |
| |\ | |||||
| * | | WIP e2e key backups | David Baker | 2018-09-13 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | Continues from uhoreg's branch This just fixed the errcode on /room_keys/version if no backup and updates the schema delta to be on the latest so it gets run | ||||
| * | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 13 | -79/+143 |
| |\ \ | |||||
| * | | | missing import | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | use parse_string | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | | | | |||||
| * | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 1 | -2/+3 |
| | | | | |||||
| * | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 1 | -0/+6 |
| | | | | |||||
| * | | | improve docstring | Matthew Hodgson | 2018-08-12 | 1 | -1/+5 |
| | | | | |||||
| * | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -1/+10 |
| | | | | |||||
| * | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 1 | -0/+51 |
| | | | | |||||
| * | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -0/+2 |
| | | | | |||||
| * | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 1 | -1/+8 |
| | | | | |||||
| * | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -0/+47 |
| | | | | |||||
| * | | | document the API | Matthew Hodgson | 2018-08-12 | 1 | -0/+133 |
| | | | | |||||
| * | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 2 | -13/+22 |
| | | | | |||||
| * | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 1 | -4/+33 |
| | | | | |||||
| * | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 1 | -0/+56 |
| | | | | |||||
* | | | | Rely on the lack of ?u to represent public access | Travis Ralston | 2018-10-12 | 2 | -10/+6 |
| | | | | | | | | | | | | also general cleanup | ||||
* | | | | Use a flag rather than a new route for the public policy | Travis Ralston | 2018-10-03 | 2 | -16/+24 |
| | | | | | | | | | | | | This also means that the template now has optional parameters, which will need to be documented somehow. | ||||
* | | | | Auto-consent to the privacy policy if the user registered with terms | Travis Ralston | 2018-10-03 | 1 | -0/+6 |
| | | | | |||||
* | | | | Make the terms flow requried | Travis Ralston | 2018-10-03 | 1 | -4/+4 |
| | | | | |||||
* | | | | Flesh out the fallback auth for terms | Travis Ralston | 2018-10-03 | 1 | -7/+67 |
| | | | | |||||
* | | | | Incorporate Dave's work for GDPR login flows | Travis Ralston | 2018-10-03 | 2 | -0/+35 |
| |_|/ |/| | | | | | As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117 | ||||
* | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Fix some instances of ExpiringCache not expiring cache items | ||||
| * | | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead. | ||||
* | | | | 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 #3835 from krombel/fix_3821 | Amber Brown | 2018-09-12 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | fix VOIP crashes under Python 3 | ||||
| * | | | fix VOIP crashes under Python 3 (#3821) | Krombel | 2018-09-10 | 1 | -1/+5 |
| | | | | |||||
* | | | | Port rest/ to Python 3 (#3823) | Amber Brown | 2018-09-12 | 17 | -100/+112 |
|/ / / | |||||
* | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter | Richard van der Hoff | 2018-09-05 | 1 | -13/+38 |
|\ \ \ | | | | | | | | | Implement 'event_format' filter param in /sync | ||||
| * | | | Implement 'event_format' filter param in /sync | Richard van der Hoff | 2018-09-04 | 1 | -13/+38 |
| | | | | | | | | | | | | | | | | | | | | This has been specced and part-implemented; let's implement it for /sync (but no other endpoints yet :/). | ||||
* | | | | improve human readable error message | Neil Johnson | 2018-09-04 | 1 | -1/+2 |
| | | | | |||||
* | | | | improve human readable error messages | Neil Johnson | 2018-09-04 | 2 | -7/+20 |
|/ / / | |||||
* | | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 2 | -5/+7 |
| | | | |||||
* | | | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 2 | -0/+8 |
| | | | |||||
* | | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 2 | -1/+10 |
| |/ |/| | |||||
* | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-event | Erik Johnston | 2018-08-22 | 1 | -1/+1 |
|\ \ | | | | | | | Allow guests to use /rooms/:roomId/event/:eventId | ||||
| * | | Allow guests to access /rooms/:roomId/event/:eventId | Will Hunt | 2018-08-20 | 1 | -1/+1 |
| | | | |||||
* | | | fix another consent encoding fail | Richard van der Hoff | 2018-08-21 | 1 | -1/+1 |
| | | | |||||
* | | | Fix 500 error from /consent form | Richard van der Hoff | 2018-08-21 | 1 | -2/+11 |
|/ / | | | | | | | Fixes #3731 | ||||
* | | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 2 | -6/+6 |
| | | |||||
* | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 1 | -1/+2 |
| | | |||||
* | | Remove v1/register's broken shared secret functionality (#3703) | Amber Brown | 2018-08-18 | 1 | -54/+0 |
| | | |||||
* | | Add GET media/v1/config (#3184) | Will Hunt | 2018-08-16 | 2 | -1/+50 |
| | | |||||
* | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -1/+12 |
| | | |||||
* | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -0/+1 |
| | | |||||
* | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -3/+29 |
| | | |||||
* | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 2 | -6/+27 |
|\ \ | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | ||||
| * | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 2 | -6/+27 |
| |/ | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | ||||
* / | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -1/+1 |
|\ | | | | | Clean up handling of errors from outbound requests | ||||
| * | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This commit replaces SynapseError.from_http_response_exception with HttpResponseException.to_synapse_error. The new method actually returns a ProxiedRequestError, which allows us to pass through additional metadata from the API call. | ||||
* | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 2 | -2/+2 |
|\ \ | |||||
| * | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity. | ||||
* | | | Merge pull request #3620 from fuzzmz/return-404-room-not-found | Richard van der Hoff | 2018-08-01 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | return 404 if room not found | ||||
| * | | return NotFoundError if room not found | Serban Constantin | 2018-07-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the Client-Server API[0] we should return `M_NOT_FOUND` if the room isn't found instead of generic SynapseError. This ensures that /directory/list API returns 404 for room not found instead of 400. [0]: https://matrix.org/docs/spec/client_server/unstable.html#get-matrix-client-r0-directory-list-room-roomid Signed-off-by: Serban Constantin <serban.constantin@gmail.com> | ||||
* | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 3 | -14/+22 |
|/ / | |||||
* | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 1 | -0/+9 |
| | | | | | | make /context lazyload & filter aware. | ||||
* | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call. | ||||
* | | Wrap a number of things that run in the background | Richard van der Hoff | 2018-07-25 | 2 | -2/+14 |
| | | | | | | | | | | This will reduce the number of "Starting db connection from sentinel context" warnings, and will help with our metrics. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-23 | 6 | -13/+206 |
|\ \ | | | | | | | | | | erikj/client_apis_move | ||||
| * | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 1 | -0/+122 |
| | | | |||||
| * | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 5 | -13/+84 |
| |/ | |||||
* | | Move RoomContextHandler out of Handlers | Erik Johnston | 2018-07-18 | 1 | -2/+2 |
| | | | | | | | | This is in preparation for moving GET /context/ to a worker | ||||
* | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 2 | -15/+13 |
|/ | | | | | This will let us call the read only parts from workers, and so be able to move some APIs off of master, e.g. the `/state` API. | ||||
* | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 1 | -1/+1 |
| | |||||
* | rerun isort with latest version | Krombel | 2018-07-16 | 1 | -13/+3 |
| | |||||
* | check isort by travis | Krombel | 2018-07-16 | 5 | -9/+19 |
| | |||||
* | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 1 | -2/+2 |
| | |||||
* | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 14 | -139/+92 |
|\ | | | | | Use parse and asserts from http.servlet | ||||
| * | fix sytests | Amber Brown | 2018-07-14 | 1 | -1/+1 |
| | | |||||
| * | add changelog | Krombel | 2018-07-13 | 1 | -1/+1 |
| | | |||||
| * | rename assert_params_in_request to assert_params_in_dict | Krombel | 2018-07-13 | 9 | -30/+30 |
| | | | | | | | | | | | | the method "assert_params_in_request" does handle dicts and not requests. A request body has to be parsed to json before this method can be used | ||||
| * | Use parse_{int,str} and assert from http.servlet | Krombel | 2018-07-13 | 13 | -132/+85 |
| | | | | | | | | | | | | | | parse_integer and parse_string can take a request and raise errors in case we have wrong or missing params. This PR tries to use them more to deduplicate some code and make it better readable | ||||
* | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 7 | -35/+31 |
|/ | |||||
* | Merge branch 'develop' into rav/enforce_report_api | Richard van der Hoff | 2018-07-12 | 51 | -339/+338 |
|\ | |||||
| * | run isort | Amber Brown | 2018-07-09 | 50 | -307/+288 |
| | | |||||
| * | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 5 | -5/+8 |
| | | |||||
| * | update doc for deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -1/+1 |
| | | |||||
| * | add GDPR erase param to deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -1/+12 |
| | | |||||
| * | Revert "Revert "Merge pull request #3431 from ↵ | Erik Johnston | 2018-06-25 | 2 | -3/+14 |
| | | | | | | | | | | | | matrix-org/rav/erasure_visibility"" This reverts commit 1d009013b3c3e814177afc59f066e02a202b21cd. | ||||
| * | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 2 | -14/+3 |
| | | | | | | | | | | This reverts commit ce0d911156b355c5bf452120bfb08653dad96497, reversing changes made to b4a5d767a94f1680d07edfd583aae54ce422573e. | ||||
| * | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 2 | -3/+14 |
| |\ | | | | | | | Support hiding events from deleted users | ||||
| | * | mark accounts as erased when requested | Richard van der Hoff | 2018-06-12 | 2 | -3/+14 |
| | | | |||||
| * | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 2 | -3/+7 |
| | | | |||||
| * | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 3 | -17/+0 |
| |/ | |||||
| * | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 1 | -3/+10 |
| |\ | | | | | | | Remove email addresses / phone numbers from ID servers when they're removed from synapse | ||||
| | * | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 1 | -3/+5 |
| | |\ | |||||
| | * | | pep8 | David Baker | 2018-05-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Unbind 3pids when they're deleted too | David Baker | 2018-05-24 | 1 | -3/+10 |
| | | | | |||||
| * | | | fix log | Richard van der Hoff | 2018-06-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix event-purge-by-ts admin API | Richard van der Hoff | 2018-06-07 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | This got completely broken in 0.30. Fixes #3300. | ||||
| * | | | Consistently use six's iteritems and wrap lazy keys/values in list() if ↵ | Amber Brown | 2018-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | they're not meant to be lazy (#3307) | ||||
* | | | | Enforce the specified API for report_event | Richard van der Hoff | 2018-05-31 | 1 | -2/+23 |
|/ / / | | | | | | | | | | | | | as per https://matrix.org/docs/spec/client_server/unstable.html#post-matrix-client-r0-rooms-roomid-report-eventid | ||||
* | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | replace some iteritems with six | ||||
| * | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | | | Merge pull request #3247 from NotAFile/py3-misc | Amber Brown | 2018-05-24 | 1 | -3/+5 |
|\ \ \ \ | |_|_|/ |/| | | | Misc Python3 fixes | ||||
| * | | | py3-ize url preview | Adrian Tschira | 2018-05-19 | 1 | -3/+5 |
| |/ / | |||||
* | | | Merge pull request #3243 from NotAFile/py3-six-3 | Erik Johnston | 2018-05-24 | 1 | -3/+5 |
|\ \ \ | |_|/ |/| | | Replace some more comparisons with six | ||||
| * | | Replace some more comparisons with six | Adrian Tschira | 2018-05-19 | 1 | -3/+5 |
| |/ | | | | | | | | | | | plus a bonus b"" string I missed last time Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | Add a 'has_consented' template var to consent forms | Richard van der Hoff | 2018-05-22 | 1 | -3/+14 |
| | | | | | | | | fixes #3260 | ||||
* | | Enable auto-escaping for the consent templates | Richard van der Hoff | 2018-05-22 | 1 | -1/+4 |
| | | | | | | | | ... to reduce the risk of somebody introducing an html injection attack... | ||||
* | | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 1 | -0/+4 |
| | | | | | | | | | | ... and have the sync endpoints call it directly rather than obsure indirection via PresenceHandler | ||||
* | | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 1 | -5/+3 |
| | | | | | | | | turns out we need to reuse this, so it's better in the config class. | ||||
* | | Rename 'version' param on user consent config | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | we're going to use it for the version we require too. | ||||
* | | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 1 | -25/+21 |
| | | | | | | | | ONE DAY I WILL PURGE THE WORLD OF THIS EVIL | ||||
* | | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 1 | -9/+13 |
|/ | | | | | | The transaction cache has some code which tries to stop it caching failures, but if the callback function failed straight away, then things would happen backwards and we'd end up with the failure stuck in the cache. | ||||
* | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -7/+10 |
|\ | | | | | Make purge_history operate on tokens | ||||
| * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -7/+10 |
| | | | | | | | | As we're soon going to change how topological_ordering works | ||||
* | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 2 | -5/+4 |
| | | | | | | | | | | | | | | Handlers is deprecated nowadays, so let's move this out before I add a new dependency on it. Also fix the docstrings on create_room. | ||||
* | | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 2 | -0/+210 |
|\ \ | |/ |/| | ConsentResource to gather policy consent from users | ||||
| * | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 2 | -0/+210 |
| | | | | | | | | | | Hopefully there are enough comments and docs in this that it makes sense on its own. | ||||
* | | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 9 | -14/+1 |
|/ | | | | | | | | | | | | (instead of everywhere that writes a response. Or rather, the subset of places which write responses where we haven't forgotten it). This also means that we don't have to have the mysterious version_string attribute in anything with a request handler. Unfortunately it does mean that we have to pass the version string wherever we instantiate a SynapseSite, which has been c&ped 150 times, but that is code that ought to be cleaned up anyway really. | ||||
* | Remove redundant request_handler decorator | Richard van der Hoff | 2018-05-10 | 5 | -29/+38 |
| | | | | | | This is needless complexity; we might as well use the wrapper directly. Also rename wrap_request_handler->wrap_json_request_handler. | ||||
* | notifications: Convert next_token to string according to the spec | Konstantinos Sideris | 2018-05-05 | 1 | -1/+1 |
| | | | | | | Currently the parameter is serialized as an integer. Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com> | ||||
* | Merge pull request #3161 from NotAFile/remove-v1auth | Richard van der Hoff | 2018-05-03 | 2 | -2/+6 |
|\ | | | | | Make Client-Server API return 403 for invalid token | ||||
| * | Burminate v1auth | Adrian Tschira | 2018-04-30 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | Fix logcontext leak in media repo | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 |
|/ | | | | Make FileResponder.write_to_consumer uphold the logcontext contract | ||||
* | add guard for None on purge_history api | Krombel | 2018-04-30 | 1 | -1/+14 |
| | |||||
* | Merge pull request #3155 from NotAFile/py3-bytes-1 | Richard van der Hoff | 2018-04-30 | 1 | -3/+3 |
|\ | | | | | more bytes strings | ||||
| * | more bytes strings | Adrian Tschira | 2018-04-29 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | Merge pull request #3140 from matrix-org/rav/use_run_in_background | Richard van der Hoff | 2018-04-30 | 1 | -2/+3 |
|\ \ | | | | | | | Use run_in_background in preference to preserve_fn | ||||
| * | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 1 | -2/+7 |
| |\| | |||||
| * | | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object. | ||||
* | | | Merge pull request #3156 from NotAFile/py3-hmac-bytes | Richard van der Hoff | 2018-04-30 | 2 | -11/+15 |
|\ \ \ | | | | | | | | | Construct HMAC as bytes on py3 | ||||
| * | | | Construct HMAC as bytes on py3 | Adrian Tschira | 2018-04-29 | 2 | -11/+15 |
| | |/ | |/| | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 4 | -7/+8 |
|\ \ \ | |/ / |/| | | Use six.moves.urlparse | ||||
| * | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 4 | -7/+8 |
| |/ | | | | | | | | | | | The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* / | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 1 | -2/+7 |
|/ | | | | | | | | | | | | | | | | | | There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background. | ||||
* | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 1 | -6/+1 |
|\ | | | | | Limit concurrent event sends for a room | ||||
| * | Use create_and_send_nonmember_event everywhere | Erik Johnston | 2018-04-09 | 1 | -6/+1 |
| | | |||||
* | | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 1 | -32/+0 |
|\ \ | | | | | | | move handling of auto_join_rooms to RegisterHandler | ||||
| * \ | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 3 | -3/+3 |
| |\ \ | |||||
| * | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 1 | -32/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de> | ||||
* | | | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Add b prefixes to some strings that are bytes in py3 | ||||
| * | | | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -2/+2 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | | | Merge pull request #3073 from NotAFile/use-six-reraise | Richard van der Hoff | 2018-04-09 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Replace old-style raise with six.reraise | ||||
| * | | | | Replace old-style raise with six.reraise | Adrian Tschira | 2018-04-06 | 1 | -1/+3 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old style raise is invalid syntax in python3. As noted in the docs, this adds one more frame in the traceback, but I think this is acceptable: <ipython-input-7-bcc5cba3de3f> in <module>() 16 except: 17 pass ---> 18 six.reraise(*x) /usr/lib/python3.6/site-packages/six.py in reraise(tp, value, tb) 691 if value.__traceback__ is not tb: 692 raise value.with_traceback(tb) --> 693 raise value 694 finally: 695 value = None <ipython-input-7-bcc5cba3de3f> in <module>() 9 10 try: ---> 11 x() 12 except: 13 x = sys.exc_info() Also note that this uses six, which is not formally a dependency yet, but is included indirectly since most packages depend on it. Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
* | | | | Merge pull request #2938 from dklug/develop | Richard van der Hoff | 2018-04-09 | 1 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | Return 401 for invalid access_token on logout | ||||
| * | | | Return 401 for invalid access_token on logout | dklug | 2018-03-02 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | Signed-off-by: Duncan Klug <dklug@ucmerced.edu> | ||||
* | | | | Merge pull request #2986 from jplatte/join_reponse_room_id | Richard van der Hoff | 2018-04-05 | 1 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Add room_id to the response of `rooms/{roomId}/join` | ||||
| * | | | | Add room_id to the response of `rooms/{roomId}/join` | Jonas Platte | 2018-03-13 | 1 | -1/+6 |
| | |_|/ | |/| | | | | | | | | | | Fixes #2349 | ||||
* | | | | Use "/settings/" (plural) | Luke Barnard | 2018-04-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use join_policy API instead of joinable | Luke Barnard | 2018-04-03 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is now under /groups/$group_id/setting/m.join_policy and expects a JSON blob of the shape ```json { "m.join_policy": { "type": "invite" } } ``` where "invite" could alternatively be "open". | ||||
* | | | | This should probably be a PUT | David Baker | 2018-03-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add joinability for groups | David Baker | 2018-03-28 | 1 | -0/+28 |
| |_|/ |/| | | | | | | | | | | | Adds API to set the 'joinable' flag, and corresponding flag in the table. | ||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 3 | -3/+3 |
| | | | | |||||
* | | | | Replace some ujson with simplejson to make it work | Erik Johnston | 2018-03-16 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | RoomMembershipRestServlet doesn't handle /forget | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Due to the order we register the REST handlers `/forget` was handled by the correct handler. | ||||
* | | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 1 | -3/+35 |
| | | | | | | | | | | | | Make the purge request return quickly, and allow scripts to poll for updates. | ||||
* | | | Provide a means to pass a timestamp to purge_history | Richard van der Hoff | 2018-03-05 | 1 | -3/+55 |
| |/ |/| | |||||
* | | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 3 | -13/+15 |
| | | |||||
* | | Make store_file use store_into_file | Erik Johnston | 2018-02-14 | 1 | -26/+11 |
| | | |||||
* | | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 1 | -1/+0 |
|\ \ | | | | | | | Create a worker for event creation | ||||
| * | | Add event_creator worker | Erik Johnston | 2018-02-07 | 1 | -1/+0 |
| | | | |||||
* | | | Fix typos in purge api & doc | Richard van der Hoff | 2018-02-13 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | * It's supposed to be purge_local_events, not ..._history * Fix the doc to have valid json | ||||
* | | | Merge pull request #2857 from matrix-org/erikj/upload_store | Erik Johnston | 2018-02-12 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | Tell storage providers about new file so they can upload | ||||
| * | | | Tell storage providers about new file so they can upload | Erik Johnston | 2018-02-07 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge pull request #2858 from matrix-org/rav/purge_updates | Richard van der Hoff | 2018-02-09 | 1 | -1/+10 |
|\ \ \ | |/ / |/| | | delete_local_events for purge_room_history | ||||
| * | | delete_local_events for purge_history | Richard van der Hoff | 2018-02-09 | 1 | -1/+10 |
| | | | | | | | | | | | | Add a flag which makes the purger delete local events | ||||
* | | | Update copyright | Erik Johnston | 2018-02-06 | 2 | -0/+2 |
| | | | |||||
* | | | Update places where we create events | Erik Johnston | 2018-02-05 | 2 | -9/+11 |
| | | | |||||
* | | | Merge pull request #2791 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-02-05 | 3 | -12/+47 |
|\ \ \ | | | | | | | | | Ensure media is in local cache before thumbnailing | ||||
| * | | | Use better file consumer | Erik Johnston | 2018-01-18 | 1 | -5/+10 |
| | | | | |||||
| * | | | Ensure media is in local cache before thumbnailing | Erik Johnston | 2018-01-18 | 3 | -10/+40 |
| | | | | |||||
* | | | | Merge pull request #2845 from matrix-org/rav/urlcache_error_handling | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 |
|\ \ \ \ | | | | | | | | | | | Handle url_previews with no content-type | ||||
| * | | | | Handle url_previews with no content-type | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid failing with an exception if the remote server doesn't give us a Content-Type header. Also, clean up the exception handling a bit. | ||||
* | | | | | Merge branch 'develop' into travis/admin-list-media | Travis Ralston | 2018-02-01 | 6 | -30/+138 |
|\| | | | | |||||
| * | | | | fix thinko on 3pid whitelisting | Matthew Hodgson | 2018-01-24 | 1 | -2/+2 |
| | | | | |