summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-2420-196/+674
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-232-1/+13
| | * | | | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2019-09-231-0/+2
| | * | | | | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-231-51/+62
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-19181-2622/+6021
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | * | | | | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-233-4/+24
| | * | | | | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2019-09-231-0/+3
| | * | | | | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2019-09-231-1/+13
| | * | | | | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-232-2/+79
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-235-125/+202
| * | | | | | | | | | | | Merge commit '33757bad1' into rav/saml_mapping_workRichard van der Hoff2019-09-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | More better loggingRichard van der Hoff2019-09-201-1/+2
| * | | | | | | | | | | | | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-19181-2622/+6021
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | better loggingRichard van der Hoff2019-09-191-0/+2
| * | | | | | | | | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-135-10/+250
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-131-51/+62
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Review commentsErik Johnston2019-09-253-6/+3
* | | | | | | | | | | Prune rows in user_ips older than configured periodErik Johnston2019-09-242-8/+67
* | | | | | | | | | | Add has_completed_background_updateErik Johnston2019-09-241-1/+24
* | | | | | | | | | | Add wrap_as_background_process decorator.Erik Johnston2019-09-241-1/+28
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Query devices table for last seen info.Erik Johnston2019-09-231-49/+8
* | | | | | | | | | Add BG update to populate devices last seen infoErik Johnston2019-09-232-0/+55
* | | | | | | | | | Add last seen info to devices table.Erik Johnston2019-09-232-0/+36
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-231-0/+5
* | | | | | | | | Generalize email sending logging (#6075)Andrew Morgan2019-09-231-1/+1
* | | | | | | | | Return timeout error to user for identity server calls (#6073)Andrew Morgan2019-09-232-11/+37
* | | | | | | | | Merge pull request #6072 from matrix-org/rav/fix_retry_resetRichard van der Hoff2019-09-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix exception when resetting retry timingsRichard van der Hoff2019-09-201-1/+1
* | | | | | | | | | fix broken copyrightsMatthew Hodgson2019-09-232-2/+2
* | | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-2010-72/+346
* | | | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint (#6...Andrew Morgan2019-09-201-1/+1
|/ / / / / / / / /
* | | | | | | | | Ensure email validation link parameters are URL-encoded (#6063)Andrew Morgan2019-09-201-4/+6
* | | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-201-4/+0
* | | | | | | | | Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-191-1/+1
* | | | | | | | | Undo the deletion of some tables (#6047)Richard van der Hoff2019-09-191-20/+0
* | | | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-191-17/+0
* | | | | | | | | Fix typo in account_threepid_delegates config (#6028)Jorik Schellekens2019-09-181-1/+1
* | | | | | | | | Fix logcontext spam on non-Linux platforms (#6059)J. Ryan Stinnett2019-09-181-2/+11
| |/ / / / / / / |/| | | | | | |
* | | | | | | | v2 3PID Invites (part of MSC2140) (#5979)Andrew Morgan2019-09-171-23/+81
* | | | | | | | (#5849) Convert rst to markdown (#6040)dstipp2019-09-171-6/+6
* | | | | | | | Fix race condition in room stats. (#6029)Erik Johnston2019-09-171-4/+10
* | | | | | | | Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-173-8/+56
* | | | | | | | Fix well-known lookups with the federation certificate whitelist (#5997)Amber Brown2019-09-143-15/+22
* | | | | | | | Fix for structured logging tests stomping on logs (#6023)Amber Brown2019-09-137-24/+45
* | | | | | | | Remove the cap on federation retry interval. (#6026)Richard van der Hoff2019-09-121-2/+2
* | | | | | | | Fix bug in calculating the federation retry backoff period (#6025)Richard van der Hoff2019-09-121-2/+3
* | | | | | | | Fix SSO fallback loginDavid Baker2019-09-121-1/+1
* | | | | | | | add report_stats_endpoint config option (#6012)Sorunome2019-09-122-2/+13
* | | | | | | | Blow up config if opentracing is missing (#5985)Jorik Schellekens2019-09-121-0/+7
* | | | | | | | Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-111-2/+9
* | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-115-35/+237
* | | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionErik Johnston2019-09-114-12/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix commentsErik Johnston2019-09-113-3/+3
| * | | | | | | | Fix how we check for self redactionErik Johnston2019-09-111-4/+18
| * | | | | | | | Allow use of different ratelimits for admin redactions.Erik Johnston2019-09-114-12/+56
* | | | | | | | | Clean up some code in the retry logic (#6017)Richard van der Hoff2019-09-112-36/+13
* | | | | | | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec...Andrew Morgan2019-09-111-10/+2
* | | | | | | | | Check dependencies on setup in the nicer way. (#5989)Jorik Schellekens2019-09-113-28/+19
* | | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2019-09-111-2/+26
* | | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add p...Andrew Morgan2019-09-113-4/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationErik Johnston2019-09-103-42/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Add changelogAndrew Morgan2019-09-102-4/+4
| * | | | | | | | Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-103-42/+45
* | | | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersJason Robinson2019-09-092-8/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix code style, againJason Robinson2019-09-091-3/+1
| * | | | | | | | | Simplify count_real_users SQL to only count user_type is null rowsJason Robinson2019-09-091-1/+1
| * | | | | | | | | Simplify is_real_user_txn check to trust user_type is null if real userJason Robinson2019-09-091-1/+1
| * | | | | | | | | Auto-fix a few code style issuesJason Robinson2019-09-091-4/+4
| * | | | | | | | | Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-092-8/+43
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-093-1/+136
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix commentsErik Johnston2019-09-091-2/+3
| * | | | | | | | | Default to censoring redactions after seven daysErik Johnston2019-09-091-4/+6
| * | | | | | | | | Use better names in SQLErik Johnston2019-09-091-5/+8
| * | | | | | | | | Fixup commentErik Johnston2019-09-091-4/+12
| * | | | | | | | | Don't start looping call unless enabledErik Johnston2019-09-091-1/+2
| * | | | | | | | | Handle setting retention period to 0Erik Johnston2019-09-092-2/+2
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red...Erik Johnston2019-09-05102-1339/+1680
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make redaction retention period configurableErik Johnston2019-09-052-2/+19
| * | | | | | | | | | Censor redactions in DB after a monthErik Johnston2019-08-302-1/+104
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Add a build info metric to Prometheus (#6005)Amber Brown2019-09-101-0/+12
* | | | | | | | | | Add opentracing span for HTTP pushErik Johnston2019-09-091-1/+12
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Servers-known-about statistic (#5981)Amber Brown2019-09-072-0/+90
* | | | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2019-09-061-1/+7
* | | | | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flagErik Johnston2019-09-062-2/+6
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Correctly handle non-bool m.federate flagErik Johnston2019-09-062-2/+6
* | | | | | | | | Merge pull request #5993 from matrix-org/anoa/worker_store_regErik Johnston2019-09-061-79/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move delete_threepid_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-25/+25
| * | | | | | | | | Move get_threepid_validation_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-54/+54
| |/ / / / / / / /
* | | | | | | | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
* | | | | | | | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcsErik Johnston2019-09-061-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't assume there is a 'self' arg in @trace decoratorErik Johnston2019-09-061-5/+5
* | | | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2019-09-0620-289/+706
|/ / / / / / / /
* | | | | | | | Trace how long it takes for the send trasaction to complete, including retrys...Jorik Schellekens2019-09-053-38/+57
* | | | | | | | Gracefully handle log context slips and missing opentracing import errors. (#...Jorik Schellekens2019-09-051-24/+58
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_...Erik Johnston2019-09-054-8/+15
|\ \ \ \ \ \ \
| * | | | | | | use access methods (duh..)Jorik Schellekens2019-09-051-1/+3
| * | | | | | | Opentracing context cannot be noneJorik Schellekens2019-09-051-1/+1
| * | | | | | | Link the send loop with the edus contextsJorik Schellekens2019-09-053-7/+12
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Add opentracing to all client servlets (#5983)Jorik Schellekens2019-09-055-18/+25
* | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-052-47/+126
* | | | | | | Fix opentracing contexts missing from outbound replication requests (#5982)Jorik Schellekens2019-09-051-4/+16
* | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-052-1/+35
|/ / / / / /
* | | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-043-64/+9
* | | | | | Cleanup event auth type initialisation (#5975)Andrew Morgan2019-09-041-5/+5
* | | | | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-047-528/+1041
* | | | | | code cleanupsAndrew Morgan2019-09-031-7/+2
* | | | | | Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-031-2/+5
* | | | | | Fix docstringAndrew Morgan2019-09-031-2/+1
* | | | | | Remove unnecessary variable declarationAndrew Morgan2019-09-031-1/+0
* | | | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Travis Ralston2019-09-031-0/+1
* | | | | | fix typoMatthew Hodgson2019-09-031-1/+1
* | | | | | Remove double return statements (#5962)Andrew Morgan2019-09-0314-20/+0
* | | | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-037-58/+117
* | | | | | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-022-137/+1
* | | | | | fix thumbnail storage location (#5915)L0ric02019-09-021-1/+1
* | | | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
* | | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3074-280/+280
* | | | | | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-1/+6
* | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-303-165/+9
|/ / / / /
* | | | | Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-1/+2
* | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-283-2/+7
|\ \ \ \ \
| * | | | | Apply suggestions from code reviewWill Hunt2019-08-231-2/+2
| * | | | | Exempt bot usersHalf-Shot2019-08-231-1/+1
| * | | | | Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consentHalf-Shot2019-08-231-1/+2
| |\ \ \ \ \
| | * | | | | Add bot typeHalf-Shot2019-08-231-1/+2
| * | | | | | Ignore consent for support usersHalf-Shot2019-08-231-0/+1
| * | | | | | Return user_type in get_user_by_idHalf-Shot2019-08-231-1/+4
| |/ / / / /
* | | | | | Let synctl use a config directory. (#5904)Jorik Schellekens2019-08-281-3/+4
* | | | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-283-9/+165
* | | | | | Config templating (#5900)Jorik Schellekens2019-08-284-37/+161
* | | | | | Implement a structured logging output system. (#5680)Amber Brown2019-08-2819-77/+763
* | | | | | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-281-8/+16
* | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-283-9/+42
|\ \ \ \ \ \
| * | | | | | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-273-9/+42
* | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-283-16/+95
|\ \ \ \ \ \ \
| * | | | | | | Use MSC2197 on stable prefix as it has almost finished FCPOlivier Wilkinson (reivilibre)2019-08-202-26/+4
| * | | | | | | Add support for inbound MSC2197 requests on unstable Federation APIOlivier Wilkinson (reivilibre)2019-08-151-1/+59
| * | | | | | | Support MSC2197 outbound with unstable prefixOlivier Wilkinson (reivilibre)2019-08-152-16/+59
* | | | | | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsErik Johnston2019-08-272-208/+217
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix off by one error in SRV result shufflingErik Johnston2019-08-271-8/+13
| * | | | | | | | Fixup commentsErik Johnston2019-08-231-1/+9
| * | | | | | | | Fix logcontextsErik Johnston2019-08-231-4/+8
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_l...Erik Johnston2019-08-2229-243/+742
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove now unused pick_server_from_listErik Johnston2019-08-201-30/+0
| * | | | | | | | | Fixup _sort_server_list to be slightly more efficientErik Johnston2019-08-201-2/+11
| * | | | | | | | | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-152-189/+202
* | | | | | | | | | Allow schema deltas to be engine-specific (#5911)reivilibre2019-08-271-5/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Code style (Black)Olivier Wilkinson (reivilibre)2019-08-271-3/+1
| * | | | | | | | | | Allow schema deltas to be engine-specificOlivier Wilkinson (reivilibre)2019-08-271-5/+21
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitRichard van der Hoff2019-08-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Increase max display name limitNeil Johnson2019-08-241-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-273-26/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't implicitly include server signing keyErik Johnston2019-08-231-7/+6
| * | | | | | | | | | Fixup review commentsErik Johnston2019-08-232-4/+4
| * | | | | | | | | | Only sign when we respond to remote key requestsErik Johnston2019-08-212-23/+16
| * | | | | | | | | | Add config option for keys to use to sign keysErik Johnston2019-08-212-9/+38
* | | | | | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-272-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | public_base_url is actually public_baseurlAaron Raimist2019-08-262-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* / | | | | | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-274-0/+111
|/ / / / / / / / /
* | | | | | | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-227-92/+208
* | | | | | | | | 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
* | | | | | | | | | Opentracing across workers (#5771)Jorik Schellekens2019-08-224-83/+122
* | | | | | | | | | Revert "Do not send consent notices if "no-consent-required" is set"Brendan Abolivier2019-08-221-4/+0
* | | | | | | | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-223-18/+3
* | | | | | | | | | Do not send consent notices if "no-consent-required" is setHalf-Shot2019-08-221-0/+4
* | | | | | | | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-223-3/+18
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-222-37/+115
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change jitter to be a factor rather than absolute valueErik Johnston2019-08-201-11/+12
| * | | | | | | | | Fixup changelog and remove debug loggingErik Johnston2019-08-161-4/+1
| * | | | | | | | | Retry well known on fail.Erik Johnston2019-08-152-34/+114
* | | | | | | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-226-7/+141
* | | | | | | | | | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-221-0/+17
* | | | | | | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-224-0/+213
* | | | | | | | | | Improve error msg when key-fetch fails (#5896)Richard van der Hoff2019-08-221-5/+7
* | | | | | | | | | Drop some unused tables. (#5893)Richard van der Hoff2019-08-213-47/+22
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-201-45/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-201-45/+65
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Avoid deep recursion in appservice recovery (#5885)Richard van der Hoff2019-08-201-18/+25
* | | | | | | | | Opentracing doc update (#5776)Jorik Schellekens2019-08-201-27/+40
|/ / / / / / / /
* | | | | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-191-17/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove logging for #5407 and update commentsErik Johnston2019-08-151-17/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into developBrendan Abolivier2019-08-174-13/+39
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1Richard van der Hoff2019-08-171-1/+1
| * | | | | | | Drop dependency on sdnotify (#5871)Richard van der Hoff2019-08-172-11/+37
| * | | | | | | Fix issue with Synapse not starting up. Fixes #5866.Chris Moos2019-08-161-1/+1
* | | | | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexHubert Chathi2019-08-162-1/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | update set_e2e_room_key to agree with fixed indexHubert Chathi2019-08-141-1/+1
| * | | | | | | | add the version field to the index for e2e_room_keysHubert Chathi2019-08-141-0/+18
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Opentracing misc (#5856)Jorik Schellekens2019-08-163-16/+24
* | | | | | | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-152-10/+10
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'master' into developBrendan Abolivier2019-08-152-3/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0Brendan Abolivier2019-08-151-1/+1
| * | | | | | Wrap `get_local_public_room_list` call in `maybeDeferred` because itOlivier Wilkinson (reivilibre)2019-08-141-2/+8
| | |_|/ / / | |/| | | |
* | | | | | Don't create broken room when power_level_content_override.users does not con...Michael Telatynski2019-08-151-1/+13
| |_|/ / / |/| | | |
* | | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-142-25/+65
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Retry well-known lookup before expiry.Erik Johnston2019-08-132-25/+65
* | | | | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-131-1/+1
* | | | | fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
* | | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-133-21/+54
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove redundant returnErik Johnston2019-08-131-1/+0
| * | | | Clarify docstringErik Johnston2019-08-131-1/+1
| * | | | Handle pusher being deleted during processing.Erik Johnston2019-08-013-21/+55
* | | | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-136-91/+172
* | | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-132-149/+200
|\ \ \ \ \
| * | | | | Make default well known cache global again.Erik Johnston2019-08-131-1/+4
| * | | | | Move well known lookup into a separate clasErik Johnston2019-08-072-153/+197
| * | | | | Add a lower bound for TTL on well known results.Erik Johnston2019-08-061-0/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-131-128/+142
|\ \ \ \ \
| * | | | | Don't unnecessarily block notifying of new events.Erik Johnston2019-08-061-128/+142
* | | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-101/+112
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Handle loops in redaction eventsRichard van der Hoff2019-07-301-60/+36
| * | | | | recursively fetch redactionsRichard van der Hoff2019-07-301-32/+36
| * | | | | split _get_events_from_db out of _enqueue_eventsRichard van der Hoff2019-07-291-32/+51
| * | | | | Return dicts from _fetch_event_listRichard van der Hoff2019-07-291-15/+27
* | | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-061-6/+37
|\ \ \ \ \ \
| * | | | | | Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| | |/ / / / | |/| | | |
* / | | | | 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)Brendan Abolivier2019-08-015-11/+71
|\ \ \ \ \
| * | | | | LintBrendan Abolivier2019-08-012-16/+9
| * | | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+76
* | | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-011-4/+3
|\ \ \ \ \ \
| * | | | | | Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
* | | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-011-21/+21
* | | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-011-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Handle incorrectly encoded query params correctlyErik Johnston2019-08-011-1/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-011-2/+9
|\ \ \ \ \ \
| * | | | | | Validate well-known state events are state events.Erik Johnston2019-07-311-2/+9
* | | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-011-0/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix spelling.Erik Johnston2019-08-011-1/+3
| |/ / / / /
| * | | | | Don't allow clients to send tombstones that reference the same roomErik Johnston2019-07-311-0/+7
* | | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-011-1/+3
|\ \ \ \ \ \
| * | | | | | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
| |/ / / / /
* | | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-012-32/+60
|\ \ \ \ \ \
| * | | | | | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| * | | | | | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
* | | | | | | Explicitly check that tombstone is a state event before notifying.Erik Johnston2019-07-311-1/+7
| |/ / / / / |/| | | | |
* | | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-311-1/+2
* | | | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
* | | | | | Share SSL options for well-known requestsErik Johnston2019-07-312-11/+13
| |_|_|_|/ |/| | | |
* | | | | Don't recreate columnErik Johnston2019-07-302-1/+22
| |/ / / |/| | |
* | | | Fix current_state_events membership background update.Erik Johnston2019-07-302-1/+1
* | | | Unwrap errorErik Johnston2019-07-301-1/+2
* | | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
* | | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-303-30/+6
| |/ / |/| |
* | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-305-11/+206
|/ /
* | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-291-0/+6
|\ \
| * | Fix room summary when rejected events are in stateErik Johnston2019-07-261-0/+6
* | | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-292-35/+123
|\ \ \