| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove the ability to query relations when the original event was redacted. (... | Andrew Morgan | 2019-07-18 | 1 | -32/+43 |
* | fix typo: backgroud -> background | Andrew Morgan | 2019-07-12 | 1 | -1/+1 |
* | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 2 | -4/+15 |
* | Don't bundle aggregations when retrieving the original event (#5654) | Andrew Morgan | 2019-07-10 | 1 | -2/+12 |
* | Include the original event in /relations (#5626) | Andrew Morgan | 2019-07-09 | 1 | -3/+5 |
* | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 3 | -18/+10 |
* | Factor out some redundant code in the login impl (#5639) | Richard van der Hoff | 2019-07-08 | 1 | -39/+10 |
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 6 | -18/+14 |
* | Fix media repo breaking (#5593) | Amber Brown | 2019-07-02 | 1 | -0/+1 |
* | Complete the SAML2 implementation (#5422) | Richard van der Hoff | 2019-07-02 | 2 | -43/+48 |
|\ |
|
| * | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-07-01 | 9 | -122/+75 |
| |\ |
|
| * | | rename BaseSSORedirectServlet for consistency | Richard van der Hoff | 2019-06-27 | 1 | -3/+3 |
| * | | Move all the saml stuff out to a centralised handler | Richard van der Hoff | 2019-06-26 | 2 | -44/+4 |
| * | | Merge branch 'develop' into rav/saml2_client | Richard van der Hoff | 2019-06-26 | 57 | -1432/+1275 |
| |\ \ |
|
| * | | | Code cleanups and simplifications. | Richard van der Hoff | 2019-06-11 | 2 | -45/+42 |
| * | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_client | Richard van der Hoff | 2019-06-10 | 39 | -321/+531 |
| |\ \ \ |
|
| * | | | | SAML2 Improvements and redirect stuff | Alexander Trost | 2019-06-02 | 1 | -0/+46 |
* | | | | | Fix JWT login with new users (#5586) | PauRE | 2019-07-02 | 1 | -6/+3 |
* | | | | | fix async/await consentresource (#5585) | Amber Brown | 2019-07-01 | 1 | -1/+3 |
| |_|_|/
|/| | | |
|
* | | | | Make the http server handle coroutine-making REST servlets (#5475) | Amber Brown | 2019-06-29 | 8 | -120/+73 |
* | | | | Fix JWT login (#5555) | PauRE | 2019-06-27 | 1 | -1/+1 |
| |_|/
|/| | |
|
* | | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 1 | -1/+1 |
* | | | Run Black. (#5482) | Amber Brown | 2019-06-20 | 57 | -1426/+1254 |
* | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file | Erik Johnston | 2019-06-14 | 1 | -2/+4 |
|\ \ \ |
|
| * | | | Don't log exception when failing to fetch remote content. | Erik Johnston | 2019-06-07 | 1 | -2/+4 |
* | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 1 | -4/+5 |
|\ \ \ \ |
|
| * | | | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 1 | -4/+5 |
| |/ / / |
|
* | | / | Don't warn user about password reset disabling through config code (#5387) | Andrew Morgan | 2019-06-11 | 1 | -4/+15 |
| |_|/
|/| | |
|
* | | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai... | Brendan Abolivier | 2019-06-10 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Don't check whether the user's account is expired on /send_mail requests | Brendan Abolivier | 2019-06-05 | 1 | -1/+1 |
* | | | Add ability to perform password reset via email without trusting the identity... | Andrew Morgan | 2019-06-06 | 1 | -5/+238 |
* | | | Neilj/add r0.5 to versions (#5360) | Neil Johnson | 2019-06-05 | 1 | -0/+1 |
* | | | Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_se... | Richard van der Hoff | 2019-06-04 | 1 | -10/+2 |
|\ \ \ |
|
| * | | | Notary server: make requests to origins in parallel | Richard van der Hoff | 2019-06-04 | 1 | -10/+2 |
* | | | | Hawkowl/fix missing auth (#5328) | Amber Brown | 2019-06-04 | 1 | -0/+1 |
|/ / / |
|
* | / | Unify v1 and v2 REST client APIs (#5226) | Amber Brown | 2019-06-03 | 37 | -305/+287 |
| |/
|/| |
|
* | | Fix ignored filter field in `/messages` endpoint | Eisha Chen-yen-su | 2019-05-30 | 1 | -0/+2 |
* | | Merge pull request #5256 from aaronraimist/logout-correct-error | Erik Johnston | 2019-05-30 | 1 | -18/+9 |
|\ \ |
|
| * | | Lint | Aaron Raimist | 2019-05-29 | 1 | -2/+0 |
| * | | Get rid of try except | Aaron Raimist | 2019-05-27 | 1 | -16/+9 |
| * | | Show correct error when logging out and access token is missing | Aaron Raimist | 2019-05-24 | 1 | -4/+4 |
* | | | Implement the SHHS complexity API (#5216) | Amber Brown | 2019-05-30 | 1 | -3/+9 |
* | | | Serve CAS login over r0 (#5286) | Amber Brown | 2019-05-30 | 1 | -2/+2 |
* | | | Fix error when downloading thumbnail with width/height param missing (#5258) | Aaron Raimist | 2019-05-29 | 1 | -2/+2 |
|/ / |
|
* | | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events | Erik Johnston | 2019-05-24 | 1 | -0/+3 |
|\ \ |
|
| * | | Don't bundle events in /sync or /events | Erik Johnston | 2019-05-21 | 1 | -0/+3 |
* | | | Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchers | Erik Johnston | 2019-05-23 | 1 | -3/+3 |
|\ \ \ |
|
| * | | | Fix remote_key_resource | Richard van der Hoff | 2019-05-23 | 1 | -3/+3 |
| |/ / |
|
* / / | Add config option for setting homeserver's default room version (#5223) | Andrew Morgan | 2019-05-23 | 1 | -2/+3 |
|/ / |
|
* | | Merge pull request #5209 from matrix-org/erikj/reactions_base | Erik Johnston | 2019-05-20 | 2 | -0/+340 |
|\ \ |
|
| * | | Move parsing of tokens out of storage layer | Erik Johnston | 2019-05-16 | 1 | -0/+19 |
| * | | Check that event is visible in new APIs | Erik Johnston | 2019-05-16 | 1 | -2/+15 |
| * | | Add aggregations API | Erik Johnston | 2019-05-16 | 1 | -1/+140 |
| * | | Actually implement idempotency | Erik Johnston | 2019-05-15 | 1 | -1/+8 |
| * | | Add simple pagination API | Erik Johnston | 2019-05-15 | 1 | -0/+50 |
| * | | Add simple send_relation API and track in DB | Erik Johnston | 2019-05-15 | 2 | -0/+112 |
* | | | Fix image orientation when generating thumbnail (#5039) | PauRE | 2019-05-16 | 2 | -0/+44 |
* | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only | David Baker | 2019-05-16 | 1 | -5/+17 |
|\ \ \
| |_|/
|/| | |
|
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... | David Baker | 2019-05-13 | 1 | -0/+10 |
| |\ \ |
|
| * | | | Re-order flows so that email auth is done last | David Baker | 2019-05-10 | 1 | -4/+12 |
| * | | | Comment | David Baker | 2019-05-10 | 1 | -0/+4 |
| * | | | Add a DUMMY stage to captcha-only registration flow | David Baker | 2019-05-10 | 1 | -1/+1 |
* | | | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_... | David Baker | 2019-05-16 | 1 | -18/+22 |
|\ \ \ \ |
|
| * | | | | Only check 3pids not in use when registering | David Baker | 2019-05-14 | 1 | -18/+22 |
* | | | | | Make all the rate limiting options more consistent (#5181) | Amber Brown | 2019-05-15 | 1 | -10/+13 |
* | | | | | Drop support for v2_alpha API prefix (#5190) | Richard van der Hoff | 2019-05-15 | 6 | -24/+19 |
| |_|_|/
|/| | | |
|
* | | | | Newsfile | Erik Johnston | 2019-05-14 | 1 | -6/+6 |
* | | | | Allow client event serialization to be async | Erik Johnston | 2019-05-14 | 4 | -43/+48 |
|/ / / |
|
* | / | Migrate all tests to use the dict-based config format instead of hanging item... | Amber Brown | 2019-05-13 | 1 | -0/+1 |
| |/
|/| |
|
* | | URL preview blacklisting fixes (#5155) | Andrew Morgan | 2019-05-10 | 1 | -0/+10 |
|/ |
|
* | Revert 085ae346ace418e0fc043ac5f568f85ebf80038e | David Baker | 2019-05-10 | 1 | -1/+1 |
* | Add a DUMMY stage to captcha-only registration flow | David Baker | 2019-05-10 | 1 | -1/+1 |
* | add options to require an access_token to GET /profile and /publicRooms on CS... | Matthew Hodgson | 2019-05-08 | 2 | -12/+34 |
* | Remove the requirement to authenticate for /admin/server_version. (#5122) | Richard van der Hoff | 2019-05-07 | 1 | -10/+5 |
* | Add admin api for sending server_notices (#5121) | Richard van der Hoff | 2019-05-02 | 3 | -3/+118 |
* | Factor out an "assert_requester_is_admin" function (#5120) | Richard van der Hoff | 2019-05-02 | 2 | -75/+79 |
* | fix examples | Richard van der Hoff | 2019-05-01 | 1 | -4/+4 |
* | Move admin api impl to its own package | Richard van der Hoff | 2019-05-01 | 2 | -4/+3 |
* | Move admin API to a new prefix | Richard van der Hoff | 2019-05-01 | 2 | -22/+60 |
* | Move admin API away from ClientV1RestServlet | Richard van der Hoff | 2019-05-01 | 1 | -33/+33 |
* | Remove log error for .well-known/matrix/client (#4972) | Michael Kaye | 2019-04-24 | 1 | -1/+1 |
* | Prevent "producer not unregistered" message (#5009) | Amber Brown | 2019-04-24 | 1 | -0/+4 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou... | Erik Johnston | 2019-04-17 | 9 | -89/+70 |
|\ |
|
| * | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 2 | -0/+64 |
| |\ |
|
| * \ | Merge pull request #5071 from matrix-org/babolivier/3pid-check | Brendan Abolivier | 2019-04-17 | 1 | -0/+18 |
| |\ \ |
|
| | * | | Make sure we're not registering the same 3pid twice | Brendan Abolivier | 2019-04-17 | 1 | -0/+18 |
| * | | | Merge pull request #5070 from matrix-org/erikj/postpath | Erik Johnston | 2019-04-17 | 1 | -8/+8 |
| |\ \ \ |
|
| | * | | | Remove usage of request.postpath | Erik Johnston | 2019-04-16 | 1 | -8/+8 |
| * | | | | Merge pull request #5063 from matrix-org/erikj/move_endpoints | Erik Johnston | 2019-04-15 | 1 | -0/+7 |
| |\| | | |
|
| | * | | | Only handle GET requests for /push_rules | Erik Johnston | 2019-04-15 | 1 | -0/+7 |
| * | | | | Remove periods from copyright headers (#5046) | Andrew Morgan | 2019-04-11 | 2 | -2/+2 |
| |/ / / |
|
| * | | | Add admin API for group deletion | Erik Johnston | 2019-04-03 | 1 | -0/+26 |
| * | | | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 1 | -1/+1 |
| * | | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 1 | -67/+0 |
| * | | | Merge pull request #4982 from matrix-org/erikj/msc1915 | Erik Johnston | 2019-04-03 | 1 | -2/+3 |
| |\ \ \ |
|
| | * | | | Add unbind API to /r0 as it is now stabalised | Erik Johnston | 2019-04-01 | 1 | -1/+1 |
| | * | | | Allowing specifying IS to use in unbind API. | Erik Johnston | 2019-04-01 | 1 | -1/+2 |
| * | | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 2 | -7/+5 |
| |/ / / |
|
| * / / | remove log line for password (#4965) | Neil Johnson | 2019-03-28 | 1 | -2/+0 |
| |/ / |
|
* | / | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 2 | -1/+69 |
| |/
|/| |
|
* | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 2 | -0/+64 |
|/ |
|
* | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 1 | -4/+45 |
* | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 1 | -20/+35 |
|\ |
|
| * | Use flags | Erik Johnston | 2019-03-20 | 1 | -2/+4 |
| * | Gracefully handle failing to kick user | Erik Johnston | 2019-03-20 | 1 | -19/+27 |
| * | Log new room ID | Erik Johnston | 2019-03-20 | 1 | -1/+6 |
* | | Add option to disable searching in the user dir | Erik Johnston | 2019-03-19 | 1 | -0/+6 |
|/ |
|
* | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 2 | -2/+12 |
* | fix incorrect encoding of filenames with spaces in (#2090) | Matthew Hodgson | 2019-03-11 | 1 | -3/+51 |
* | Send message after room has been shutdown | Erik Johnston | 2019-03-06 | 1 | -11/+11 |
* | Make registration ratelimiter separate from the main events one | Brendan Abolivier | 2019-03-06 | 1 | -1/+1 |
* | Revert "Split ratelimiters in two (one for events, one for registration)" | Brendan Abolivier | 2019-03-06 | 1 | -1/+1 |
* | Split ratelimiters in two (one for events, one for registration) | Brendan Abolivier | 2019-03-05 | 1 | -1/+1 |
* | Merge pull request #4772 from jbweston/jbweston/server-version-api | Erik Johnston | 2019-03-05 | 1 | -0/+23 |
|\ |
|
| * | Add 'server_version' endpoint to admin API | Joseph Weston | 2019-03-01 | 1 | -0/+23 |
* | | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 1 | -4/+29 |
|/ |
|
* | Fix parsing of Content-Disposition headers (#4763) | Richard van der Hoff | 2019-02-27 | 1 | -20/+65 |
* | Don't log stack trace when client has gone away during media download (#4738) | Erik Johnston | 2019-02-25 | 1 | -2/+9 |
* | switch from google.com to recaptcha.net for reCAPTCHA (#4731) | Matthew Hodgson | 2019-02-25 | 1 | -1/+1 |
* | Fix registration on workers (#4682) | Erik Johnston | 2019-02-20 | 4 | -138/+15 |
* | Merge pull request #4666 from matrix-org/erikj/register_login_split | Erik Johnston | 2019-02-18 | 2 | -69/+28 |
|\ |
|
| * | Move register_device into handler | Erik Johnston | 2019-02-18 | 2 | -84/+24 |
| * | Update docs | Erik Johnston | 2019-02-18 | 1 | -1/+1 |
| * | Split out registration to worker | Erik Johnston | 2019-02-18 | 1 | -27/+46 |
* | | 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 |
|/ |
|
* | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updating | Erik Johnston | 2019-02-11 | 1 | -0/+34 |
|\ |
|
| * | make sure version is in body and wrap in linearizer queue | Hubert Chathi | 2019-02-08 | 1 | -1/+2 |
| * | 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 |
|/ |
|
* | Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ... | Neil Johnson | 2019-01-30 | 2 | -14/+5 |
|\ |
|
| * | 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 anoa/dm_room_upg... | Andrew Morgan | 2019-01-25 | 1 | -13/+10 |
| | |\ |
|
| | * | | 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 |
* | Add GET account data routes (#4303) | Travis Ralston | 2019-01-07 | 1 | -1/+33 |
* | 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 |
* | 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 |
* | 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 |