summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-247-8/+75
|\
| * remove unused parameter to get_user_id_by_threepid (#6099)Richard van der Hoff2019-09-242-1/+2
| * Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingRichard van der Hoff2019-09-243-7/+62
| |\
| | * docstrings and commentsRichard van der Hoff2019-09-241-7/+21
| | * Merge branch 'develop' into rav/fix_attribute_mappingRichard van der Hoff2019-09-19363-5354/+10634
| | |\
| | * | Fix a bug with saml attribute maps.Richard van der Hoff2019-09-193-7/+48
| * | | Add sid to next_link for email validation (#6097)J. Ryan Stinnett2019-09-242-0/+11
* | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-2451-231/+840
|\| | |
| * | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-234-1/+16
| * | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2019-09-232-0/+3
| * | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-233-102/+122
| |\ \ \
| * | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-235-4/+28
| * | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2019-09-232-0/+4
| * | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2019-09-232-1/+14
| * | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-233-2/+80
| * | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-237-134/+203
| * | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-232-0/+6
| * | | | Generalize email sending logging (#6075)Andrew Morgan2019-09-232-1/+2
| * | | | Return timeout error to user for identity server calls (#6073)Andrew Morgan2019-09-233-11/+38
| * | | | Merge pull request #6072 from matrix-org/rav/fix_retry_resetRichard van der Hoff2019-09-232-1/+2
| |\ \ \ \
| | * | | | Fix exception when resetting retry timingsRichard van der Hoff2019-09-202-1/+2
| * | | | | fix broken copyrightsMatthew Hodgson2019-09-232-2/+2
| * | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-2012-72/+359
| * | | | | Remove trailing slash ability from password reset's submit_token endpoint (#6...Andrew Morgan2019-09-202-1/+2
| |/ / / /
| * | | | Ensure email validation link parameters are URL-encoded (#6063)Andrew Morgan2019-09-202-4/+7
| * | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-203-4/+10
| * | | | Docker: support SYNAPSE_WORKER envvar (#6058)Michael Kaye2019-09-193-1/+5
| * | | | Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-193-2/+3
| * | | | Update the upgrade notes (#6050)Richard van der Hoff2019-09-192-27/+54
| * | | | Add some notes on rolling back to v1.3.1. (#6049)Richard van der Hoff2019-09-192-0/+26
| * | | | Undo the deletion of some tables (#6047)Richard van der Hoff2019-09-193-21/+3
| * | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-192-17/+1
| * | | | Fix typo in account_threepid_delegates config (#6028)Jorik Schellekens2019-09-183-2/+3
| * | | | Give appropriate exit codes when synctl fails (#5992)Jorik Schellekens2019-09-182-4/+40
| * | | | Fix logcontext spam on non-Linux platforms (#6059)J. Ryan Stinnett2019-09-182-2/+12
| | |_|/ | |/| |
* | | | 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
* | | | | Update 6037.featureRichard van der Hoff2019-09-191-1/+1
* | | | | Merge branch 'rav/saml_config_cleanup' into rav/saml_mapping_workRichard van der Hoff2019-09-191-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-19363-5354/+10634
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add changelogRichard van der Hoff2019-09-191-0/+1
* | | | | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-19363-5354/+10634
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | fix sample configRichard van der Hoff2019-09-181-1/+1
| * | | v2 3PID Invites (part of MSC2140) (#5979)Andrew Morgan2019-09-172-23/+82
| * | | (#5849) Convert rst to markdown (#6040)dstipp2019-09-1741-2192/+2088
| * | | Fix race condition in room stats. (#6029)Erik Johnston2019-09-172-4/+11
| * | | Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-177-12/+195
| * | | Fix well-known lookups with the federation certificate whitelist (#5997)Amber Brown2019-09-145-15/+63
| * | | Add developer docs for using SAML without a server (#6032)Travis Ralston2019-09-132-0/+38
| * | | Fix for structured logging tests stomping on logs (#6023)Amber Brown2019-09-1313-41/+154
| * | | Remove the cap on federation retry interval. (#6026)Richard van der Hoff2019-09-122-2/+3
| * | | Fix bug in calculating the federation retry backoff period (#6025)Richard van der Hoff2019-09-122-2/+4
| * | | Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_loginDavid Baker2019-09-122-1/+2
| |\ \ \
| | * | | changelogDavid Baker2019-09-121-0/+1
| | * | | Fix SSO fallback loginDavid Baker2019-09-121-1/+1
| |/ / /
| * | | add report_stats_endpoint config option (#6012)Sorunome2019-09-124-2/+19
| * | | Blow up config if opentracing is missing (#5985)Jorik Schellekens2019-09-122-0/+8
| * | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-registerJason Robinson2019-09-123-2/+28
| |\ \ \
| | * | | Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-113-2/+28
| |/ / /
| * | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-116-35/+238
| * | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionErik Johnston2019-09-117-12/+103
| |\ \ \
| | * | | Update sample configErik Johnston2019-09-111-1/+1
| | * | | Fix commentsErik Johnston2019-09-114-5/+5
| | * | | Add test for admin redaction ratelimiting.Erik Johnston2019-09-111-0/+25
| | * | | Fix how we check for self redactionErik Johnston2019-09-111-4/+18
| | * | | Update sample configErik Johnston2019-09-111-0/+7
| | * | | NewsfileErik Johnston2019-09-111-0/+1
| | * | | 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-113-36/+14
| * | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec...Andrew Morgan2019-09-112-10/+3
| * | | | Check dependencies on setup in the nicer way. (#5989)Jorik Schellekens2019-09-114-28/+20
| * | | | Fix existing v2 identity server calls (MSC2140) (#6013)Andrew Morgan2019-09-112-2/+27
| * | | | Remove origin parameter from add_display_name_to_third_party_invite and add p...Andrew Morgan2019-09-114-4/+10
| |/ / /
| * | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationErik Johnston2019-09-104-42/+46
| |\ \ \
| | * | | Add changelogAndrew Morgan2019-09-103-4/+5
| | * | | 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-094-10/+69
| |\ \ \ \
| | * | | | 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-094-10/+71
| * | | | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-096-2/+220
| |\ \ \ \ \
| | * | | | | Fix commentsErik Johnston2019-09-091-2/+3
| | * | | | | Default to censoring redactions after seven daysErik Johnston2019-09-092-7/+11
| | * | | | | 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-05144-1781/+2395
| | |\ \ \ \ \
| | * | | | | | Fix testErik Johnston2019-09-051-1/+3
| | * | | | | | Make redaction retention period configurableErik Johnston2019-09-054-3/+27
| | * | | | | | NewsfileErik Johnston2019-08-301-0/+1
| | * | | | | | Censor redactions in DB after a monthErik Johnston2019-08-303-1/+175
| * | | | | | | Add a build info metric to Prometheus (#6005)Amber Brown2019-09-103-2/+33
| * | | | | | | Merge pull request #6003 from matrix-org/erikj/push_opentracingErik Johnston2019-09-092-1/+13
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | NewsfileErik Johnston2019-09-091-0/+1
| | * | | | | | Add opentracing span for HTTP pushErik Johnston2019-09-091-1/+12
| |/ / / / / /
| * | | | | | Servers-known-about statistic (#5981)Amber Brown2019-09-077-60/+226
| * | | | | | Ensure a sid parameter is passed to bind_threepid (#5995)Andrew Morgan2019-09-062-1/+8
| * | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flagErik Johnston2019-09-063-2/+7
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | NewsfileErik Johnston2019-09-061-0/+1
| | * | | | | 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-062-79/+80
| |\ \ \ \ \ \
| | * | | | | | Move delete_threepid_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-25/+25
| | * | | | | | Change changelogAndrew Morgan2019-09-062-1/+1
| | * | | | | | Move get_threepid_validation_session into RegistrationWorkerStoreAndrew Morgan2019-09-061-54/+54
| | * | | | | | Add changelogAndrew Morgan2019-09-061-0/+1
| | |/ / / / /
| * | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fixErik Johnston2019-09-063-2/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| | * | | | | Add changelogAndrew Morgan2019-09-061-0/+1
| | * | | | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
| |/ / / / /
| * | | | | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcsErik Johnston2019-09-062-5/+6
| |\ \ \ \ \
| | * | | | | Update changelogErik Johnston2019-09-061-1/+1
| | * | | | | NewsfileErik Johnston2019-09-061-0/+1
| | * | | | | 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-0629-302/+820
| |/ / / / /
| * | | | | Trace how long it takes for the send trasaction to complete, including retrys...Jorik Schellekens2019-09-054-38/+58
| * | | | | Gracefully handle log context slips and missing opentracing import errors. (#...Jorik Schellekens2019-09-052-24/+59
| | |/ / / | |/| | |
| * | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_...Erik Johnston2019-09-055-8/+16
| |\ \ \ \
| | * | | | use access methods (duh..)Jorik Schellekens2019-09-051-1/+3
| | * | | | Bugfix phrasingJorik Schellekens2019-09-051-1/+1
| | * | | | Opentracing context cannot be noneJorik Schellekens2019-09-051-1/+1
| | * | | | newsfileJorik Schellekens2019-09-051-0/+1
| | * | | | Link the send loop with the edus contextsJorik Schellekens2019-09-053-7/+12
| * | | | | Add opentracing to all client servlets (#5983)Jorik Schellekens2019-09-056-18/+26
| * | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-054-47/+132
| * | | | | Fix opentracing contexts missing from outbound replication requests (#5982)Jorik Schellekens2019-09-052-4/+17
| * | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-053-1/+36
| |/ / / /
| * | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-044-64/+10
| * | | | Cleanup event auth type initialisation (#5975)Andrew Morgan2019-09-042-5/+6
| * | | | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-0411-641/+1642
| * | | | code cleanupsAndrew Morgan2019-09-031-7/+2
| * | | | Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-032-2/+6
| * | | | Fix docstringAndrew Morgan2019-09-031-2/+1
| * | | | Remove unnecessary variable declarationAndrew Morgan2019-09-031-1/+0
| * | | | Docker packaging should not su-exec or chmod if already running as UID/GID (#...Michael Kaye2019-09-032-35/+50
| * | | | Ensure an auth instance is available to ListMediaInRoom (#5967)Travis Ralston2019-09-032-0/+2
| * | | | fix typoMatthew Hodgson2019-09-031-1/+1
| * | | | Remove double return statements (#5962)Andrew Morgan2019-09-0315-20/+1
| * | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-038-58/+118
| * | | | Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-023-137/+2
| * | | | fix thumbnail storage location (#5915)L0ric02019-09-022-1/+2
| * | | | Update INSTALL.md to say that Python 2 is no longer supported (#5953)Aaron Raimist2019-09-022-2/+3
| * | | | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-302-7/+1
| * | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3081-286/+287
| * | | | Move buildkite config to the pipelines repo (#5943)Amber Brown2019-08-313-310/+16
| * | | | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-302-1/+7
| * | | | Removed unused jenkins/ folder and script (#5938)Amber Brown2019-08-302-16/+1
| * | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-304-166/+9
| * | | | Fix buildkite pipeline plugin matrix-org/annotate using the wrong variable co...Amber Brown2019-08-301-3/+3
| * | | | Fix coverage in sytest and use plugins for buildkite (#5922)Amber Brown2019-08-298-32/+92
| |/ / /
| * | | Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-283-2/+5
| * | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-285-2/+9
| |\ \ \
| | * | | Removing entry for 5903Will Hunt2019-08-281-1/+0
| | * | | Apply suggestions from code reviewWill Hunt2019-08-231-2/+2
| | * | | Update changelogHalf-Shot2019-08-231-1/+1
| | * | | Exempt bot usersHalf-Shot2019-08-231-1/+1
| | * | | Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consentHalf-Shot2019-08-232-1/+3
| | |\ \ \
| | | * | | Add changelogHalf-Shot2019-08-231-0/+1
| | | * | | Add bot typeHalf-Shot2019-08-231-1/+2
| | * | | | Fix registration testHalf-Shot2019-08-231-0/+1
| | * | | | newsfile 5902Half-Shot2019-08-231-0/+1
| | * | | | 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-283-6/+15
| * | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-284-9/+166
| * | | | Config templating (#5900)Jorik Schellekens2019-08-289-46/+366
| * | | | Implement a structured logging output system. (#5680)Amber Brown2019-08-2831-82/+1328
| * | | | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-282-8/+17
| * | | | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-285-9/+62
| |\ \ \ \
| | * | | | Document GET method for retrieving admin bit of user in admin APIOlivier Wilkinson (reivilibre)2019-08-271-0/+19
| | * | | | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-274-9/+43
| * | | | | Typographical corrections in docker/README (#5921)Victor Goff2019-08-281-5/+5
| * | | | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-284-16/+96
| |\ \ \ \ \
| | * | | | | Newsfile on one lineOlivier Wilkinson (reivilibre)2019-08-201-2/+1
| | * | | | | Use MSC2197 on stable prefix as it has almost finished FCPOlivier Wilkinson (reivilibre)2019-08-202-26/+4
| | * | | | | NewsfileOlivier Wilkinson (reivilibre)2019-08-151-0/+2
| | * | | | | 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-277-215/+283
| |\ \ \ \ \ \
| | * | | | | | 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-2247-284/+850
| | |\ \ \ \ \ \
| | * | | | | | | Make changelog entry be a featureErik Johnston2019-08-201-0/+0
| | * | | | | | | 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
| | * | | | | | | Remove test debugsErik Johnston2019-08-203-3/+0
| | * | | | | | | NewsfileErik Johnston2019-08-151-0/+1
| | * | | | | | | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-154-194/+268
| * | | | | | | | Allow schema deltas to be engine-specific (#5911)reivilibre2019-08-272-5/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Code style (Black)Olivier Wilkinson (reivilibre)2019-08-271-3/+1
| | * | | | | | | | NewsfileOlivier Wilkinson (reivilibre)2019-08-271-0/+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-272-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Increase max display name limitNeil Johnson2019-08-242-1/+2
| | |/ / / / / / /
| * | | | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-275-26/+56
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't implicitly include server signing keyErik Johnston2019-08-231-7/+6
| | * | | | | | | | Fixup review commentsErik Johnston2019-08-233-6/+6
| | * | | | | | | | NewsfileErik Johnston2019-08-211-0/+1
| | * | | | | | | | 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-213-9/+46
| * | | | | | | | | Update 5909.miscRichard van der Hoff2019-08-271-1/+1
| * | | | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-273-2/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Add changelogAaron Raimist2019-08-261-0/+1
| | * | | | | | | | 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-276-0/+132
| |/ / / / / / /
| * | | | | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-229-94/+234
| * | | | | | | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Richard van der Hoff2019-08-222-53/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-222-53/+5
| * | | | | | | | Opentracing across workers (#5771)Jorik Schellekens2019-08-225-83/+123
| * | | | | | | | 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-224-72/+164
| |\ \ \ \ \ \ \
| | * | | | | | | Change jitter to be a factor rather than absolute valueErik Johnston2019-08-202-13/+14
| | * | | | | | | Fixup changelog and remove debug loggingErik Johnston2019-08-163-5/+2
| | * | | | | | | NewsfileErik Johnston2019-08-151-0/+1
| | * | | | | | | Retry well known on fail.Erik Johnston2019-08-153-67/+160
| * | | | | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-227-7/+142
| * | | | | | | | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-222-0/+18
| * | | | | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-226-0/+232
| * | | | | | | | Improve error msg when key-fetch fails (#5896)Richard van der Hoff2019-08-222-5/+8
| * | | | | | | | Drop some unused tables. (#5893)Richard van der Hoff2019-08-214-47/+23
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-203-49/+68
| |\ \ \ \ \ \ \
| | * | | | | | | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-203-49/+68
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Avoid deep recursion in appservice recovery (#5885)Richard van der Hoff2019-08-202-18/+26
| * | | | | | | Opentracing doc update (#5776)Jorik Schellekens2019-08-202-27/+41
| |/ / / / / /
| * | | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-192-17/+6
| |\ \ \ \ \ \
| | * | | | | | NewsfileErik Johnston2019-08-161-0/+1
| | * | | | | | Remove logging for #5407 and update commentsErik Johnston2019-08-151-17/+5
| | |/ / / / /
| * | | | | | Merge branch 'master' into developBrendan Abolivier2019-08-176-15/+66
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexHubert Chathi2019-08-163-1/+20
| |\ \ \ \ \ \
| | * | | | | | fix changelogHubert Chathi2019-08-151-1/+1
| | * | | | | | update set_e2e_room_key to agree with fixed indexHubert Chathi2019-08-141-1/+1
| | * | | | | | add changelogHubert Chathi2019-08-141-0/+1
| | * | | | | | add the version field to the index for e2e_room_keysHubert Chathi2019-08-141-0/+18
| * | | | | | | Opentracing misc (#5856)Jorik Schellekens2019-08-164-16/+25
| * | | | | | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-153-10/+11
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'master' into developBrendan Abolivier2019-08-156-14/+28
| |\ \ \ \ \ \
| * | | | | | | Don't create broken room when power_level_content_override.users does not con...Michael Telatynski2019-08-152-1/+14
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-145-27/+137
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | NewsfileErik Johnston2019-08-131-0/+1
| | * | | | | Retry well-known lookup before expiry.Erik Johnston2019-08-134-27/+136
* | | | | | | better loggingRichard van der Hoff2019-09-191-0/+2
* | | | | | | changelogRichard van der Hoff2019-09-131-0/+1
* | | | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-136-10/+276
| |_|_|_|_|/ |/| | | | |
* | | | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-132-102/+121
| |_|_|_|/ |/| | | |