summary refs log tree commit diff
path: root/synapse/rest/client (follow)
Commit message (Expand)AuthorAgeFilesLines
* Remove double return statements (#5962)Andrew Morgan2020-02-252-3/+0
|\
| * Remove double return statements (#5962)Andrew Morgan2019-09-032-3/+0
* | Opentrace device lists (#5853)Andrew Morgan2020-02-252-2/+6
|\|
| * Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
* | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2020-02-241-6/+1
|\|
| * Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
* | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-2430-158/+158
|\|
| * Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3030-158/+158
| * Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-1/+6
* | Add m.id_access_token flag (#5930)Andrew Morgan2020-02-241-1/+6
* | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-241-4/+2
* | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-241-2/+4
|\|
* | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Andrew Morgan2020-02-211-51/+4
|\|
| * Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Richard van der Hoff2019-08-221-53/+4
| |\
| | * Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| * | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-4/+1
| * | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-1/+4
* | | Opentrace e2e keys (#5855)Andrew Morgan2020-02-211-1/+12
|\| |
| * | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-1/+12
| |/
* | Fix up password reset template config names (#5863)Andrew Morgan2020-02-201-2/+2
|\|
| * Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-2/+2
* | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2020-02-201-3/+11
|\|
| * Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-3/+11
* | Account validity: allow defining HTML templates to serve the us… (#5807)Andrew Morgan2020-02-201-3/+3
|\|
| * LintBrendan Abolivier2019-08-011-4/+2
| * Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+17
| * Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-242-7/+32
| |\
* | \ Fix servlet metric names (#5734)Andrew Morgan2020-02-192-7/+32
|\ \ \ | | |/ | |/|
| * | Fix servlet metric names (#5734)Jorik Schellekens2019-07-242-7/+32
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-1934-229/+215
|\ \ \ | | |/ | |/|
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2334-229/+215
| |/
* | Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2020-02-191-32/+43
|\|
| * Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-181-32/+43
* | Clean up exception handling for access_tokens (#5656)Andrew Morgan2020-02-172-4/+15
|\|
| * Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-112-4/+15
* | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2020-02-171-2/+12
|\|
| * Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
* | Include the original event in /relations (#5626)Andrew Morgan2020-02-171-3/+5
|\|
| * Include the original event in /relations (#5626)Andrew Morgan2019-07-091-3/+5
* | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-172-16/+9
|\|
| * Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-082-16/+9
* | Factor out some redundant code in the login impl (#5639)Andrew Morgan2020-02-171-39/+10
|\|
| * Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-141-4/+3
* | Fix account_validity incorrect email response contentAndrew Morgan2020-02-141-2/+5
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-141-1/+1
|\|
| * Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-1/+1
* | Complete the SAML2 implementation (#5422)Andrew Morgan2020-02-141-8/+46
|\|
| * Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-021-8/+46
| |\
| | * Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-011-1/+1
| | |\
| | * | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | * | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-261-11/+2
| | * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-2636-862/+709
| | |\ \
| | * | | Code cleanups and simplifications.Richard van der Hoff2019-06-111-42/+41
| | * | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1038-311/+529
| | |\ \ \
| | * | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-021-0/+46
* | | | | | Fix JWT login with new users (#5586)Andrew Morgan2020-02-141-6/+3
|\| | | | |
| * | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
| | |_|_|/ | |/| | |
* | | | | Fix JWT login (#5555)Andrew Morgan2020-02-141-1/+1
|\| | | |
| * | | | Fix JWT login (#5555)PauRE2019-06-271-1/+1
| | |_|/ | |/| |
| * | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
* | | | Run Black. (#5482)Andrew Morgan2020-02-131-4/+4
|\| | |
| * | | Run Black. (#5482)Amber Brown2019-06-2036-854/+688
* | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1136-912/+733
* | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-106-24/+172
|\ \ \ \
| * | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-241-1/+1
| * | | | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-222-1/+19
| * | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-121-2/+3
| * | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-16/+58
| * | | | Add a /user/:user_id/info servlet to give user deactivated/expired informatio...Andrew Morgan2019-11-141-0/+89
| * | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-011-1/+1
| * | | | Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_...Brendan Abolivier2019-09-091-3/+1
| * | | | Revert "Ensure the password reset template is correctly converted to binary"Brendan Abolivier2019-09-091-2/+1
| * | | | Ensure the password reset template is correctly converted to binaryBrendan Abolivier2019-09-091-1/+2
* | | | | Remove Python 2.7 support. (#5425)Andrew Morgan2020-02-101-4/+15
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-111-4/+5
| |\ \ \
| * | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-4/+15
| | |_|/ | |/| |
| * | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-101-1/+1
| |\ \ \
* | | | | Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-291-1/+3
* | | | | LintBrendan Abolivier2019-08-011-1/+1
* | | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+15
* | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
* | | | | LintBrendan Abolivier2019-06-121-1/+0
* | | | | Fix path for password policy endpointsBrendan Abolivier2019-06-121-2/+2
* | | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-1238-329/+544
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Change password reset links to /_matrix.Erik Johnston2019-06-111-4/+5
| |/ / /
| * | | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-5/+238
| * | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-051-0/+1
| * | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-041-0/+1
| * | | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0337-305/+287
| | |/ | |/|
| * | Fix ignored filter field in `/messages` endpointEisha Chen-yen-su2019-05-301-0/+2
| * | Merge pull request #5256 from aaronraimist/logout-correct-errorErik Johnston2019-05-301-18/+9
| |\ \
| | * | LintAaron Raimist2019-05-291-2/+0
| | * | Get rid of try exceptAaron Raimist2019-05-271-16/+9
| | * | Show correct error when logging out and access token is missingAaron Raimist2019-05-241-4/+4
| * | | Serve CAS login over r0 (#5286)Amber Brown2019-05-301-2/+2
| |/ /
| * | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-241-0/+3
| |\ \
| | * | Don't bundle events in /sync or /eventsErik Johnston2019-05-211-0/+3
| * | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+3
| |/ /
* | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-112-5/+355
|\| |
| * | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+338
| |\ \
| | * | Move parsing of tokens out of storage layerErik Johnston2019-05-161-0/+19
| | * | Check that event is visible in new APIsErik Johnston2019-05-161-2/+15
| | * | Add aggregations APIErik Johnston2019-05-161-1/+140
| | * | Actually implement idempotencyErik Johnston2019-05-151-1/+8
| | * | Add simple pagination APIErik Johnston2019-05-151-0/+50
| | * | Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+110
| * | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-5/+17
| |\ \ \
| | * | | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| | * | | CommentDavid Baker2019-05-101-0/+4
| | * | | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* | | | | Merge branch 'babolivier/account_validity_send_mail_auth' into dinsic dinsic_2019-06-10Brendan Abolivier2019-06-101-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-1/+1
| |/ / /
* | | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-222-2/+63
|\ \ \ \
| * | | | Remove unused importBrendan Abolivier2019-05-201-2/+0
| * | | | First implementation of MSC2000Brendan Abolivier2019-05-202-2/+65
| |/ / /
* | | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-1711-90/+108
|\| | |
| * | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_...David Baker2019-05-161-18/+22
| |\ \ \
| | * | | Only check 3pids not in use when registeringDavid Baker2019-05-141-18/+22
| | |/ /
| * | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-10/+13
| * | | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-156-24/+19
| | |/ | |/|
| * | NewsfileErik Johnston2019-05-141-6/+6
| * | Allow client event serialization to be asyncErik Johnston2019-05-144-43/+48
| |/
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-146-847/+158
|\|
| * Revert 085ae346ace418e0fc043ac5f568f85ebf80038eDavid Baker2019-05-101-1/+1
| * Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
| * add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-082-12/+34
| * Move admin api impl to its own packageRichard van der Hoff2019-05-011-896/+0
| * Move admin API to a new prefixRichard van der Hoff2019-05-011-20/+50
| * Move admin API away from ClientV1RestServletRichard van der Hoff2019-05-011-33/+33
| * Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-177-87/+68
| |\
| | * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-0/+62
| | |\
| | * \ Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-171-0/+18
| | |\ \
| | | * | Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-171-0/+18
| | * | | Remove usage of request.postpathErik Johnston2019-04-161-8/+8
| | * | | Only handle GET requests for /push_rulesErik Johnston2019-04-151-0/+7
| * | | | Add management endpoints for account validityBrendan Abolivier2019-04-172-1/+69
| | |_|/ | |/| |
| * | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-0/+62
| | |/ | |/|
* | | Incorporate reviewBrendan Abolivier2019-05-091-4/+3
* | | Incorporate reviewBrendan Abolivier2019-05-071-0/+2
* | | Update synapse/rest/client/v2_alpha/account.pyAndrew Morgan2019-05-011-1/+1
* | | Update synapse/rest/client/v2_alpha/account.pyAndrew Morgan2019-05-011-1/+1
* | | Fixed return valueBrendan Abolivier2019-04-301-2/+2
* | | FixesBrendan Abolivier2019-04-301-4/+7
* | | Fix methodBrendan Abolivier2019-04-301-1/+1
* | | Register servletsBrendan Abolivier2019-04-301-0/+2
* | | Add bulk lookupBrendan Abolivier2019-04-301-1/+26
* | | Move lookup endpoint to CS API (and s/is_server/id_server/)Brendan Abolivier2019-04-301-0/+32
* | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-155-79/+35
|\ \ \ | | |/ | |/|
| * | Add admin API for group deletionErik Johnston2019-04-031-0/+26
| * | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-031-1/+1
| * | Remove presence lists (#4989)Neil Johnson2019-04-031-67/+0
| * | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-031-2/+3
| |\ \
| | * | Add unbind API to /r0 as it is now stabalisedErik Johnston2019-04-011-1/+1
| | * | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-011-1/+2
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-012-7/+5
| |/ /
| * / remove log line for password (#4965)Neil Johnson2019-03-281-2/+0
| |/
* | Merge branch 'master' of github.com:matrix-org/synapse into dinsicErik Johnston2019-04-051-4/+45
|\|
| * Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-4/+45
* | Fix registration with register_mxid_from_3pid enabled (#5011) dinsic_2019-04-04_1Erik Johnston2019-04-041-1/+1
* | Add config option to use email as display name for new usersErik Johnston2019-04-031-14/+17
* | Add 3PID invite support to spam checkerErik Johnston2019-03-211-1/+2
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-mergedErik Johnston2019-03-214-35/+114
|\|
| * Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-211-20/+35
| |\
| | * Use flagsErik Johnston2019-03-201-2/+4
| | * Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
| | * Log new room IDErik Johnston2019-03-201-1/+6
| * | Add option to disable searching in the user dirErik Johnston2019-03-191-0/+6
| |/
| * Add ratelimiting on login (#4821)Brendan Abolivier2019-03-152-2/+12
| * Send message after room has been shutdownErik Johnston2019-03-061-11/+11
| * Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-061-1/+1
| * Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-061-1/+1
| * Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-051-1/+1
| * Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-0/+23
| |\
| | * Add 'server_version' endpoint to admin APIJoseph Weston2019-03-011-0/+23
| * | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-4/+29
| |/
* | IsortErik Johnston2019-03-151-1/+1
* | Merge branch 'master' of github.com:matrix-org/synapse into erikj/dinsic-merg...Erik Johnston2019-03-1516-794/+540
|\|
| * switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-251-1/+1
| * Fix registration on workers (#4682)Erik Johnston2019-02-203-137/+14
| * Move register_device into handlerErik Johnston2019-02-182-84/+24
| * Update docsErik Johnston2019-02-181-1/+1
| * Split out registration to workerErik Johnston2019-02-181-27/+46
| * Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updatingErik Johnston2019-02-111-0/+34
| |\
| | * make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-081-1/+2
| | * add new endpoint to update backup versionsHubert Chathi2019-02-061-0/+33
| * | Allow "unavailable" presence status for /sync (#4592)Valentin Anger2019-02-082-1/+2
| |/
| * Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ...Neil Johnson2019-01-301-4/+4
| |\
| | * Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-301-4/+4
| | |\
| | | * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-251-13/+10
| | | |\
| | | * | Fix typosAndrew Morgan2019-01-221-4/+4
| * | | | isortNeil Johnson2019-01-301-2/+1
| |/ / /
| * | | formatting and use constants where availableNeil Johnson2019-01-301-19/+17
| * | | Populate default room version from ConstantsNeil Johnson2019-01-301-1/+2
| * | | reflect that rooms v3 is a stable room versionNeil Johnson2019-01-301-0/+1
| * | | rework format of change password capabilityNeil Johnson2019-01-291-1/+3
| * | | support change_password in capabilities end-pointNeil Johnson2019-01-291-2/+12
| * | | enforce auth for capabilities endpointNeil Johnson2019-01-291-10/+17
| * | | backout v3Neil Johnson2019-01-251-1/+0
| * | | Support room version capabilities in CS API (MSC1804)Neil Johnson2019-01-251-0/+49
| | |/ | |/|
| * | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-221-4/+5
| * | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-1/+3
| * | Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-211-11/+5
| |/
| * Add GET account data routes (#4303)Travis Ralston2019-01-071-1/+33
| * Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-293-434/+0
| * Return well_known in /login response (#4319)Richard van der Hoff2018-12-241-7/+11
| * create support user (#4141)Neil Johnson2018-12-141-1/+10
| * Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-0/+5
| * Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-071-29/+76
| * Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-061-67/+2
| * Fix non-ASCII pushrules (#4248)Amber Brown2018-12-041-12/+23
| * fix type errorAmber Brown2018-12-031-1/+1
| * Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-0/+1
| * Support m.login.sso (#4220)Richard van der Hoff2018-11-271-4/+9
| * Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-22/+16
| * Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-151-2/+2
| * Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-1/+1
| * handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-3/+18
| * Include a version query string arg for the consent routeTravis Ralston2018-10-311-2/+4
| * Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-312-1/+91
| |\
| | * Address review commentsRichard van der Hoff2018-10-261-5/+16
| | * Basic initial support for room upgradesRichard van der Hoff2018-10-251-0/+78
| * | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-242-33/+6
| |\ \
| * | | pep8Travis Ralston2018-10-152-13/+2
| * | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-151-0/+372
| |\ \ \
| * | | | Rely on the lack of ?u to represent public accessTravis Ralston2018-10-121-2/+2
| * | | | Use a flag rather than a new route for the public policyTravis Ralston2018-10-031-2/+2
| * | | | Auto-consent to the privacy policy if the user registered with termsTravis Ralston2018-10-031-0/+6
| * | | | Make the terms flow requriedTravis Ralston2018-10-031-4/+4
| * | | | Flesh out the fallback auth for termsTravis Ralston2018-10-031-7/+67
| * | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-032-0/+35
* | | | | Use internal-info for identity server. Block reg on fields dinsic_2019-02-19-beta11Andrew Morgan2019-02-192-3/+3
* | | | | Synchronise account metadata onto another server. (#4145) dinsic_2019-01-11Matthew Hodgson2019-01-113-26/+173
* | | | | hide_profile: false should mean not to hide the profile :/ github/matthew/red_list matthew/red_listMatthew Hodgson2018-12-121-1/+1
* | | | | pull in profile_handler correctlyMatthew Hodgson2018-11-041-0/+2
* | | | | add im.vector.hide_profile to user account_dataMatthew Hodgson2018-11-041-0/+5
* | | | | merge master into dinsic, again...Matthew Hodgson2018-11-0316-112/+525
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-251-1/+2
| | |_|/ | |/| |
| * | | Fix a number of flake8 errorsRichard van der Hoff2018-10-241-1/+1
| * | | Clean up room alias creationErik Johnston2018-10-191-32/+5
| | |/ | |/|
| * | missed oneDavid Baker2018-10-121-0/+1
| * | Don't mangle exceptionsDavid Baker2018-10-121-4/+2
| * | Split /room_keys/version into 2 servletsDavid Baker2018-10-121-9/+21
| * | PR feedback pt. 1David Baker2018-10-121-1/+1
| * | isortDavid Baker2018-10-091-1/+1
| * | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-0913-77/+144
| |\|
| | * Merge pull request #3835 from krombel/fix_3821Amber Brown2018-09-121-1/+5
| | |\
| | | * fix VOIP crashes under Python 3 (#3821)Krombel2018-09-101-1/+5
| | * | Port rest/ to Python 3 (#3823)Amber Brown2018-09-129-55/+60
| | |/
| | * Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filterRichard van der Hoff2018-09-051-13/+38
| | |\
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-01-28 03:54:01 +0000