| Commit message (Expand) | Author | Age | Files | Lines |
* | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-11 | 1 | -1/+2 |
* | 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 |
* | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 3 | -0/+136 |
* | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 1 | -29/+76 |
* | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 1 | -67/+2 |
* | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 1 | -0/+70 |
* | 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 |
* | Support m.login.sso (#4220) | Richard van der Hoff | 2018-11-27 | 1 | -4/+9 |
* | 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 |
* | Fix URL preview bugs (type error when loading cache from db, content-type inc... | Amber Brown | 2018-11-08 | 1 | -6/+16 |
* | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 2 | -2/+2 |
* | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -3/+18 |
* | 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 |
| * | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 2 | -0/+80 |
| * | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -1/+2 |
* | | 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 |
| * | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 1 | -32/+5 |
| |\ |
|
| | * | 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 |
| |/ |
|
* | | 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 |
* | | 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 |
| * | | 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 |
* | | | | Use a flag rather than a new route for the public policy | Travis Ralston | 2018-10-03 | 2 | -16/+24 |
* | | | | 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 |
| |_|/
|/| | |
|
* | | | 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 | Erik Johnston | 2018-09-21 | 1 | -1/+0 |
* | | | | added "media-src: 'self'" to CSP for resources (#3578) | Jérémy Farnaud | 2018-09-25 | 1 | -0/+1 |
|/ / / |
|
* | | | Merge pull request #3835 from krombel/fix_3821 | Amber Brown | 2018-09-12 | 1 | -1/+5 |
|\ \ \ |
|
| * | | | 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 | Richard van der Hoff | 2018-09-04 | 1 | -13/+38 |
* | | | | 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 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 |
|/ / |
|
* | | 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 | Erik Johnston | 2018-08-08 | 2 | -6/+27 |
| |/ |
|
* / | 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 |
|\ |
|
| * | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 1 | -1/+1 |
* | | 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 |
* | | | Merge pull request #3620 from fuzzmz/return-404-room-not-found | Richard van der Hoff | 2018-08-01 | 1 | -2/+2 |
|\ \ \
| |_|/
|/| | |
|
| * | | return NotFoundError if room not found | Serban Constantin | 2018-07-31 | 1 | -2/+2 |
* | | | 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 |
* | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 2 | -2/+2 |
* | | Wrap a number of things that run in the background | Richard van der Hoff | 2018-07-25 | 2 | -2/+14 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api... | Erik Johnston | 2018-07-23 | 6 | -13/+206 |
|\ \ |
|
| * | | 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 |
* | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 2 | -15/+13 |
|/ |
|
* | 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 |
|\ |
|
| * | 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 |
| * | Use parse_{int,str} and assert from http.servlet | Krombel | 2018-07-13 | 13 | -132/+85 |
* | | 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 matrix-org/rav/erasure_visibili... | Erik Johnston | 2018-06-25 | 2 | -3/+14 |
| * | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 2 | -14/+3 |
| * | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 2 | -3/+14 |
| |\ |
|
| | * | 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 |
| |\ |
|
| | * | 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 |
| * | | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'... | Amber Brown | 2018-05-31 | 1 | -1/+1 |
* | | | | Enforce the specified API for report_event | Richard van der Hoff | 2018-05-31 | 1 | -2/+23 |
|/ / / |
|
* | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 1 | -1/+2 |
|\ \ \ |
|
| * | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 1 | -1/+2 |
* | | | | Merge pull request #3247 from NotAFile/py3-misc | Amber Brown | 2018-05-24 | 1 | -3/+5 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | 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 | Adrian Tschira | 2018-05-19 | 1 | -3/+5 |
| |/ |
|
* | | Add a 'has_consented' template var to consent forms | Richard van der Hoff | 2018-05-22 | 1 | -3/+14 |
* | | Enable auto-escaping for the consent templates | Richard van der Hoff | 2018-05-22 | 1 | -1/+4 |
* | | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 1 | -0/+4 |
* | | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 1 | -5/+3 |
* | | Rename 'version' param on user consent config | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
* | | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 1 | -25/+21 |
* | | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 1 | -9/+13 |
|/ |
|
* | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -7/+10 |
|\ |
|
| * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -7/+10 |
* | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 2 | -5/+4 |
* | | 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 | Richard van der Hoff | 2018-05-15 | 2 | -0/+210 |
* | | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 9 | -14/+1 |
|/ |
|
* | Remove redundant request_handler decorator | Richard van der Hoff | 2018-05-10 | 5 | -29/+38 |
* | notifications: Convert next_token to string according to the spec | Konstantinos Sideris | 2018-05-05 | 1 | -1/+1 |
* | Merge pull request #3161 from NotAFile/remove-v1auth | Richard van der Hoff | 2018-05-03 | 2 | -2/+6 |
|\ |
|
| * | Burminate v1auth | Adrian Tschira | 2018-04-30 | 2 | -2/+6 |
* | | Fix logcontext leak in media repo | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 |
|/ |
|
* | 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 | Adrian Tschira | 2018-04-29 | 1 | -3/+3 |
* | | Merge pull request #3140 from matrix-org/rav/use_run_in_background | Richard van der Hoff | 2018-04-30 | 1 | -2/+3 |
|\ \ |
|
| * | | 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 |
* | | | 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 | Adrian Tschira | 2018-04-29 | 2 | -11/+15 |
| | |/
| |/| |
|
* | | | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 4 | -7/+8 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 4 | -7/+8 |
| |/ |
|
* / | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 1 | -2/+7 |
|/ |
|
* | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 1 | -6/+1 |
|\ |
|
| * | 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 |
|\ \ |
|
| * \ | 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 |
* | | | | 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 | Adrian Tschira | 2018-04-04 | 1 | -2/+2 |
| | |/ /
| |/| | |
|
* | | | | 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 | Adrian Tschira | 2018-04-06 | 1 | -1/+3 |
| | |_|/
| |/| | |
|
* | | | | 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 | dklug | 2018-03-02 | 1 | -1/+4 |
* | | | | 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` | Jonas Platte | 2018-03-13 | 1 | -1/+6 |
| | |_|/
| |/| | |
|
* | | | | 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 |
* | | | | 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 |
| |_|/
|/| | |
|
* | | | 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 |
* | | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 1 | -3/+35 |
* | | | 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 |
|\ \ |
|
| * | | 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 |
* | | | 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 | 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_history | Richard van der Hoff | 2018-02-09 | 1 | -1/+10 |
* | | | 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 |
|\ \ \ |
|
| * | | | 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 | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 |
* | | | | | 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 |
| * | | | | add ?ts massaging for ASes (#2754) | Matthew Hodgson | 2018-01-23 | 1 | -6/+11 |
| * | | | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 2 | -2/+25 |
| * | | | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid | Matthew Hodgson | 2018-01-22 | 3 | -22/+102 |
| |\ \ \ \ |
|
| | * | | | | fix typo (thanks sytest) | Matthew Hodgson | 2018-01-19 | 1 | -1/+1 |
| | * | | | | oops, check all login types | Matthew Hodgson | 2018-01-19 | 1 | -14/+11 |
| | * | | | | trailing commas | Matthew Hodgson | 2018-01-19 | 2 | -7/+7 |
| | * | | | | rewrite based on PR feedback: | Matthew Hodgson | 2018-01-19 | 4 | -76/+43 |
| | * | | | | fix up v1, and improve errors | Matthew Hodgson | 2018-01-19 | 3 | -19/+53 |
| | * | | | | fix pep8 | Matthew Hodgson | 2018-01-19 | 1 | -2/+1 |
| | * | | | | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 3 | -13/+96 |
| | | |/ /
| | |/| | |
|
* | / | | | Add an admin route to get all the media in a room | Travis Ralston | 2018-01-20 | 1 | -0/+22 |
|/ / / / |
|
* | | | | Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbs | Richard van der Hoff | 2018-01-19 | 1 | -0/+8 |
|\ \ \ \ |
|
| * | | | | Use the right path for url_preview thumbnails | Richard van der Hoff | 2018-01-19 | 1 | -0/+8 |
| |/ / / |
|
* | | | | Fix storage provider bug introduced when renamed to store_local | Erik Johnston | 2018-01-18 | 1 | -1/+1 |
* | | | | Merge pull request #2812 from matrix-org/erikj/media_storage_provider_config | Erik Johnston | 2018-01-18 | 2 | -20/+27 |
|\ \ \ \ |
|
| * | | | | Missing staticmethod | Erik Johnston | 2018-01-18 | 1 | -0/+1 |
| * | | | | Fixup comments | Erik Johnston | 2018-01-18 | 1 | -2/+2 |
| * | | | | Make storage providers more configurable | Erik Johnston | 2018-01-18 | 2 | -20/+26 |
| | |/ /
| |/| | |
|
* | | | | Fix typo in thumbnail resource causing access times to be incorrect | Erik Johnston | 2018-01-18 | 1 | -2/+2 |
| |/ /
|/| | |
|
* | | | Update last access time when thumbnails are viewed | Erik Johnston | 2018-01-17 | 1 | -0/+2 |
* | | | Keep track of last access time for local media | Erik Johnston | 2018-01-17 | 1 | -7/+25 |
|/ / |
|
* | | Add docstring | Erik Johnston | 2018-01-17 | 1 | -1/+1 |
* | | Use local vars | Erik Johnston | 2018-01-16 | 1 | -6/+2 |
* | | Change _generate_thumbnails to take media_type | Erik Johnston | 2018-01-16 | 2 | -7/+10 |
* | | Move setting of file_id up to caller | Erik Johnston | 2018-01-16 | 2 | -13/+14 |
* | | Fix typo | Erik Johnston | 2018-01-16 | 1 | -7/+10 |
* | | Fix up log lines | Erik Johnston | 2018-01-16 | 2 | -7/+10 |
* | | Correctly use server_name/file_id when generating/fetching remote thumbnails | Erik Johnston | 2018-01-16 | 2 | -5/+8 |
* | | Log when we respond with 404 | Erik Johnston | 2018-01-16 | 2 | -1/+8 |
* | | Fix thumbnailing remote files | Erik Johnston | 2018-01-16 | 2 | -2/+30 |
* | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-01-16 | 7 | -346/+843 |
|\ \ |
|
| * | | Fix up comments | Erik Johnston | 2018-01-12 | 2 | -7/+16 |