summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Log responder we are using. (#6139)Michael Kaye2019-10-072-1/+2
* Fix changelog for PR #6175Brendan Abolivier2019-10-072-1/+1
* add some logging to the rooms stats updates, to try to track down a flaky tes...Richard van der Hoff2019-10-073-0/+5
* Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_indexBrendan Abolivier2019-10-072-2/+3
|\
| * ChangelogBrendan Abolivier2019-10-071-0/+1
| * Fix unique_user_filter_index schema updateBrendan Abolivier2019-10-071-2/+2
* | Merge pull request #6159 from matrix-org/erikj/cache_membershipsErik Johnston2019-10-072-19/+46
|\ \ | |/ |/|
| * Fix bug where we didn't pull out event IDErik Johnston2019-10-071-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memb...Erik Johnston2019-10-035-19/+44
| |\
| * | Use the right error....Erik Johnston2019-10-031-1/+1
| * | pep8Erik Johnston2019-10-031-1/+0
| * | Fixup names and commentsErik Johnston2019-10-031-6/+7
| * | cachedList descriptor doesn't like typingErik Johnston2019-10-031-2/+2
| * | NewsfileErik Johnston2019-10-031-0/+1
| * | Cache room membership lookups in _get_joined_users_from_contextErik Johnston2019-10-031-19/+45
* | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-043-2/+89
|\ \ \
| * | | TypoBrendan Abolivier2019-10-041-1/+1
| * | | LintBrendan Abolivier2019-10-041-3/+1
| * | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| * | | Lint (again)Brendan Abolivier2019-10-031-3/+1
| * | | LintBrendan Abolivier2019-10-031-5/+5
| * | | Add test caseBrendan Abolivier2019-10-032-1/+84
| * | | ChangelogBrendan Abolivier2019-10-021-0/+1
| * | | LintBrendan Abolivier2019-10-021-1/+3
| * | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-021-2/+13
* | | | Update `user_filters` table to have a unique index, and non-null columns (#1172)Alexander Maznev2019-10-042-0/+47
* | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Robert Swain2019-10-042-3/+12
| |_|/ |/| |
* | | add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-035-19/+44
| |/ |/|
* | Merge branch 'master' into developAndrew Morgan2019-10-039-8/+38
|\ \
| * \ Merge tag 'v1.4.0'Andrew Morgan2019-10-03303-5895/+13375
| |\ \
| | * | 1.4.0 v1.4.0 github/release-v1.4.0 release-v1.4.0Andrew Morgan2019-10-034-2/+16
| | * | Replace client_secret with <redacted> in server logs (#6158)Andrew Morgan2019-10-032-2/+5
| | * | 1.4.0rc2 v1.4.0rc2Andrew Morgan2019-10-027-6/+19
* | | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_paginationErik Johnston2019-10-022-18/+19
|\ \ \ \
| * | | | NewsfileErik Johnston2019-10-021-0/+1
| * | | | Fix appservice room list paginationErik Johnston2019-10-021-18/+18
* | | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatableErik Johnston2019-10-022-0/+4
|\ \ \ \ \
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_room_l...Erik Johnston2019-10-020-0/+0
| |\| | | |
| * | | | | NewsfileErik Johnston2019-10-021-0/+1
| * | | | | Fix not showing non-federatable rooms to remote room list queriesErik Johnston2019-10-021-0/+3
* | | | | | Merge pull request #6148 from matrix-org/erikj/find_next_generatedErik Johnston2019-10-022-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | NewsfileErik Johnston2019-10-021-0/+1
| * | | | | Bound find_next_generated_user_id DB query.Erik Johnston2019-10-021-1/+3
* | | | | | Merge pull request #6152 from matrix-org/erikj/fix_room_listErik Johnston2019-10-023-27/+60
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | NewsfileErik Johnston2019-10-021-0/+1
| * | | | | Fix public room list pagination.Erik Johnston2019-10-022-27/+59
|/ / / / /
* | | | | Merge branch 'master' into developBrendan Abolivier2019-10-024-9/+45
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update the issue template for new way of getting server version (#6051)Richard van der Hoff2019-09-191-9/+13
| * | | | Update INSTALL.md with void-linux (#5873)Pete2019-09-191-0/+7
| * | | | add explanations on how to actually include an access_token (#6031)axel simon2019-09-131-0/+12
| * | | | README: link to reverse_proxy.rst (#6027)Richard van der Hoff2019-09-121-0/+13
* | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-027-350/+273
* | | | | Fix up some typechecking (#6150)Amber Brown2019-10-0222-40/+104
* | | | | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2019-10-023-12/+9
| |/ / / |/| | |
* | | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-0211-19/+193
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-024-1/+31
| |\ \
| | * | NewsfileErik Johnston2019-10-021-0/+1
| | * | Fix errors storing large retry intervals.Erik Johnston2019-10-023-1/+30
| * | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsErik Johnston2019-10-023-0/+51
| |\ \ \ | | |/ / | |/| |
| | * | NewsfileErik Johnston2019-10-021-0/+1
| | * | Fix fetching censored redactions from DBErik Johnston2019-10-022-0/+50
| * | | Merge pull request #6141 from matrix-org/erikj/censor_redactions_fixErik Johnston2019-10-024-18/+111
| |\ \ \ | | |/ / | |/| |
| | * | NewsfileErik Johnston2019-10-011-0/+1
| | * | Use `received_ts` to find uncensored redacted eventsErik Johnston2019-10-011-14/+7
| | * | Add received_ts column to redactions.Erik Johnston2019-10-013-9/+92
| | * | Don't repeatedly attempt to censor events we don't have.Erik Johnston2019-10-011-1/+17
| |/ /
| * | Merge pull request #6135 from matrix-org/erikj/fixup_devices_last_seen_queryErik Johnston2019-10-014-7/+55
| |\ \
* | \ \ Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s...Erik Johnston2019-10-018-11/+60
|\ \ \ \ | | |/ / | |/| |
| * | | NewsfileErik Johnston2019-09-301-0/+1
| * | | Fix `devices_last_seen` background update.Erik Johnston2019-09-303-7/+54
| |/ /
| * | Merge pull request #6117 from matrix-org/erikj/fix_sample_configErik Johnston2019-09-263-2/+3
| |\ \
| | * | NewsfileErik Johnston2019-09-261-0/+1
| | * | Fix 'redaction_retention_period' sampel config to match guidelinesErik Johnston2019-09-262-2/+2
| |/ /
| * | s/month/week/ to match configNeil Johnson2019-09-261-1/+1
| * | Update CHANGES.mdRichard van der Hoff2019-09-261-1/+1
* | | Drop unused tables (#6115)Richard van der Hoff2019-09-302-0/+21
* | | Edit SimpleHttpClient to reference that header keys can be passed as str or b...Andrew Morgan2019-09-272-6/+7
* | | Merge pull request #6125 from matrix-org/babolivier/deactivation-inviteBrendan Abolivier2019-09-273-14/+92
|\ \ \
| * | | Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| * | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| * | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+1
| * | | Update changelog.d/6125.featureBrendan Abolivier2019-09-271-1/+1
| * | | okBrendan Abolivier2019-09-271-1/+3
| * | | LintBrendan Abolivier2019-09-272-10/+2
| * | | ChangelogBrendan Abolivier2019-09-271-0/+1
| * | | Add test to validate the changeBrendan Abolivier2019-09-271-13/+57
| * | | Fixup and add some loggingBrendan Abolivier2019-09-271-1/+9
| * | | Reject pending invites on deactivationBrendan Abolivier2019-09-271-0/+31
|/ / /
* | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2019-09-273-364/+360
* | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanErik Johnston2019-09-273-1/+22
|\ \ \
| * | | isortErik Johnston2019-09-251-1/+1
| * | | Add device and appservice tagsErik Johnston2019-09-251-0/+3
| * | | NewsfileErik Johnston2019-09-251-0/+1
| * | | Add tags for event_id and txn_id in event sendingErik Johnston2019-09-251-0/+18
| * | | Don't create new span for get_user_by_reqErik Johnston2019-09-251-1/+0
* | | | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-262-64/+2
| |/ / |/| |
* | | more changelog updates v1.4.0rc1Richard van der Hoff2019-09-261-7/+7
* | | Changelog formattingRichard van der Hoff2019-09-261-2/+1
* | | changelogRichard van der Hoff2019-09-26132-132/+156
* | | Explicitly log when a homeserver does not have a trusted key server configure...Neil Johnson2019-09-264-16/+63
* | | Merge commit '1b23f991a' into release-v1.4.0Richard van der Hoff2019-09-262-42/+152
|\ \ \
| * | | Clarify upgrade notes ahead of 1.4.0 releaseNeil Johnson2019-09-262-42/+152
* | | | bump versionRichard van der Hoff2019-09-261-1/+1
|/ / /
* | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-265-39/+266
* | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Erik Johnston2019-09-267-11/+197
|\ \ \
| * | | Update comments and docstringRichard van der Hoff2019-09-251-4/+6
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-2542-495/+1317
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ipsErik Johnston2019-09-254-50/+179
|\ \ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-2540-491/+1314
| |\ \ \ \
| * | | | | Use if `is not None`Erik Johnston2019-09-251-1/+1
* | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ...Neil Johnson2019-09-252-3/+2
| |/ / / / |/| | | |
* | | | | Threepid validity checks on msisdns should not be dependent on 'threepid_beha...Neil Johnson2019-09-252-29/+35
* | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-255-16/+83
* | | | | Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-255-141/+265
* | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-254-83/+145
| |_|/ / |/| | |
* | | | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv...Brendan Abolivier2019-09-243-6/+7
|\ \ \ \
| * | | | Incorporate reviewBrendan Abolivier2019-09-241-3/+3
| * | | | Fix loggingBrendan Abolivier2019-09-241-1/+1
| * | | | TypoBrendan Abolivier2019-09-231-1/+1
| * | | | ChangelogBrendan Abolivier2019-09-231-0/+1
| * | | | Fix the return value in the users_set_deactivated_flag background jobBrendan Abolivier2019-09-231-4/+4
* | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workRichard van der Hoff2019-09-247-10/+280
|\ \ \ \ \
| * \ \ \ \ 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
| | | | * | | 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
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / /
| | | | * | | 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
| | |/ / / | |/| | |
| | | | * Review commentsErik Johnston2019-09-254-7/+4
| | | | * NewsfileErik Johnston2019-09-241-0/+1
| | | | * Test that pruning of old user IPs worksErik Johnston2019-09-241-0/+71
| | | | * Prune rows in user_ips older than configured periodErik Johnston2019-09-243-8/+73
| | | | * Add has_completed_background_updateErik Johnston2019-09-241-1/+24
| | | | * Add wrap_as_background_process decorator.Erik Johnston2019-09-241-1/+28
| | | |/
| | | * Test background updateErik Johnston2019-09-231-0/+79
| | | * NewsfileErik Johnston2019-09-231-0/+1
| | | * Query devices table for last seen info.Erik Johnston2019-09-232-50/+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-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
| |/ |/|
* | 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
|\ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-23 03:34:39 +0000