summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Build the python release artifacts in GHA tooRichard van der Hoff2021-07-131-3/+23
* build debs in GHA (#10247)Richard van der Hoff2021-07-123-4/+58
* Fix README rstErik Johnston2021-07-091-5/+4
* Fix README rstErik Johnston2021-07-091-4/+5
* Fixup changelog v1.38.0rc2Erik Johnston2021-07-091-1/+1
* Fixup changelogErik Johnston2021-07-091-1/+1
* 1.38.0rc2Erik Johnston2021-07-095-4/+17
* Ensure we always drop the federation inbound lock (#10336)Erik Johnston2021-07-093-2/+15
* Fix broken links in INSTALL.md (#10331)Dirk Klimpel2021-07-0813-617/+629
* Update links to documentation in sample config (#10287)Dirk Klimpel2021-07-0716-46/+51
* Fix broken link v1.38.0rc1Brendan Abolivier2021-07-071-1/+1
* Merge latest fix into the changelogBrendan Abolivier2021-07-072-2/+1
* Merge branch 'master' into release-v1.38Richard van der Hoff2021-07-071-30/+27
|\
| * build the docs for master (#10323)Richard van der Hoff2021-07-071-31/+28
* | ANALYZE new stream ordering column (#10326)Brendan Abolivier2021-07-072-0/+11
* | Small changelog tweaksBrendan Abolivier2021-07-061-6/+4
* | 1.38.0rc1Brendan Abolivier2021-07-0634-33/+50
* | Fix deactivate a user if he does not have a profile (#10252)Dirk Klimpel2021-07-063-22/+73
* | Add script for getting info about recently registered users (#10290)Erik Johnston2021-07-0617-153/+309
* | Handle old staged inbound events (#10303)Erik Johnston2021-07-063-10/+67
* | Add upgrade notes about disk space for events migration (#10314)Richard van der Hoff2021-07-063-1/+44
* | Add support for evicting cache entries based on last access time. (#10205)Erik Johnston2021-07-059-95/+485
* | Fix bad link in modules documentation (#10302)Brendan Abolivier2021-07-022-1/+2
* | Move methods involving event authentication to EventAuthHandler. (#10268)Patrick Cloke2021-07-0111-106/+112
* | fix ordering of bg update (#10291)Richard van der Hoff2021-07-012-1/+2
* | Reenable 'Backfilled events whose prev_events...' sytest (#10292)Erik Johnston2021-07-012-1/+1
* | Add SSO `external_ids` to Query User Account admin API (#10261)Dirk Klimpel2021-07-014-85/+159
* | Add some metrics to staging area (#10284)Erik Johnston2021-07-012-0/+40
* | Fix the homeserver config example in presence router docs (#10288)Andrew Morgan2021-06-302-1/+4
* | Change more stream_ordering columns to BIGINT (#10286)Richard van der Hoff2021-06-302-0/+31
* | Rebuild other indexes using `stream_ordering` (#10282)Richard van der Hoff2021-06-303-6/+56
* | Merge branch 'master' into developErik Johnston2021-06-303-1/+15
|\|
| * Fixup changelog v1.37.1Erik Johnston2021-06-301-1/+1
| * Add note to changelogErik Johnston2021-06-301-1/+3
| * 1.37.1Erik Johnston2021-06-303-1/+13
* | Correct type hints for synapse.event_auth. (#10253)Patrick Cloke2021-06-306-38/+51
* | Fix the inbound PDU metric (#10279)Erik Johnston2021-06-306-27/+93
* | Merge branch 'release-v1.37' into developRichard van der Hoff2021-06-294-3/+10
|\|
| * 1.37.1rc1 v1.37.1rc1Richard van der Hoff2021-06-294-3/+10
* | Merge branch 'release-v1.37' into developRichard van der Hoff2021-06-2912-6/+718
|\|
| * Update newsfiles v1.37.1a1Richard van der Hoff2021-06-292-1/+1
| * v1.37.1a1Richard van der Hoff2021-06-291-1/+1
| * Merge remote-tracking branch 'origin/erikj/async_federation_base_branch' into...Richard van der Hoff2021-06-2911-5/+717
| |\
| | * Handle inbound events from federation asynchronously (#10272)Erik Johnston2021-06-295-5/+241
| | * Add a distributed lock (#10269)Erik Johnston2021-06-296-0/+476
* | | Do not recurse into non-spaces in the spaces summary. (#10256)Patrick Cloke2021-06-295-26/+43
* | | Fix `populate_stream_ordering2` background job (#10267)Richard van der Hoff2021-06-292-16/+13
* | | Migrate stream_ordering to a bigint (#10264)Richard van der Hoff2021-06-294-16/+163
* | | Soft-fail spammy events received over federation (#10263)Richard van der Hoff2021-06-292-6/+7
* | | Merge branch 'master' into developBrendan Abolivier2021-06-293-3/+11
|\| |
| * | Move deprecation notices to the top of the changelog v1.37.0Brendan Abolivier2021-06-291-6/+2
| * | 1.37.0Brendan Abolivier2021-06-293-1/+13
| |/
* | Add additional types to the federation transport server. (#10213)Patrick Cloke2021-06-283-118/+521
* | Adjust the URL in the README.rst file to point to LiberaChat instead of freen...Felix Kronlage-Dammers2021-06-282-1/+2
* | Create an index.html file when generating a docs build (#10242)Andrew Morgan2021-06-242-1/+7
* | Return errors from `send_join` etc if the event is rejected (#10243)Richard van der Hoff2021-06-243-10/+41
* | Improve validation for `send_{join,leave,knock}` (#10225)Richard van der Hoff2021-06-246-183/+132
* | MSC2918 Refresh tokens implementation (#9450)Quentin Gliech2021-06-2415-61/+892
* | Merge tag 'v1.37.0rc1' into developBrendan Abolivier2021-06-2450-53/+155
|\|
| * Incorportate review comments v1.37.0rc1Brendan Abolivier2021-06-241-3/+3
| * Fix date in changelogBrendan Abolivier2021-06-241-1/+1
| * Tweak changelogBrendan Abolivier2021-06-242-15/+19
| * Fix wrapping of legacy check_registration_for_spam (#10238)Brendan Abolivier2021-06-233-6/+84
| * 1.37.0rc1Brendan Abolivier2021-06-2348-47/+67
* | Convert UPGRADE.rst to markdown (#10166)Andrew Morgan2021-06-238-1365/+1381
* | Fixes to the release script (#10239)Brendan Abolivier2021-06-232-25/+28
* | Re-introduce "Leave out optional keys from /sync" change (#10214)Andrew Morgan2021-06-234-55/+53
* | Improve the reliability of auto-joining remote rooms (#10237)Brendan Abolivier2021-06-233-17/+96
* | Send out invite rejections and knocks over federation (#10223)Richard van der Hoff2021-06-233-1/+16
* | Drop Origin & Accept from Access-Control-Allow-Headers value (#10114)Michael[tm] Smith2021-06-232-1/+2
|/
* Fix schema delta to not take as long on large servers (#10227)Erik Johnston2021-06-222-2/+6
* Warn users trying to use the deprecated spam checker interface (#10210)Brendan Abolivier2021-06-222-0/+16
* Add endpoints for backfilling history (MSC2716) (#9247)Eric Eastwood2021-06-2214-23/+584
* Implement config option `sso.update_profile_information` (#10108)jkanefendt2021-06-214-1/+51
* Fix performance of responding to user key requests over federation (#10221)Erik Johnston2021-06-213-1/+11
* Check third party rules before persisting knocks over federation (#10212)Andrew Morgan2021-06-212-2/+3
* Ensure that errors during startup are written to the logs and the console. (#...Richard van der Hoff2021-06-215-16/+55
* Deploy a documentation version for each new Synapse release (#10198)Andrew Morgan2021-06-182-0/+34
* Fix a missing await when in the spaces summary. (#10208)Patrick Cloke2021-06-183-3/+100
* Describe callbacks signatures as async in new modules doc (#10206)Brendan Abolivier2021-06-182-8/+9
* Standardise the module interface (#10062)Brendan Abolivier2021-06-1823-188/+769
* Expose opentracing trace id in response headers (#10199)Richard van der Hoff2021-06-183-0/+25
* Remove support for ACME v1 (#10194)Brendan Abolivier2021-06-1718-836/+18
* Update MSC3083 support per changes in the MSC. (#10189)Patrick Cloke2021-06-174-31/+47
* Ensure that we do not cache empty sync responses after a timeout (#10158)Richard van der Hoff2021-06-178-21/+84
* Rip out the DNS lookup limiter (#10190)Richard van der Hoff2021-06-172-104/+1
* update black to 21.6b0 (#10197)Marcus2021-06-1717-27/+28
* Fix incorrect time magnitude on delayed call (#10195)Andrew Morgan2021-06-172-1/+2
* Add fields to better debug where events are being soft_failed (#10168)Eric Eastwood2021-06-172-3/+19
* Fix persist_events to stop leaking opentracing contexts (#10193)Richard van der Hoff2021-06-172-1/+2
* Improve comments in the structured logging code. (#10188)Patrick Cloke2021-06-162-4/+6
* Always require users to re-authenticate for dangerous operations. (#10184)Patrick Cloke2021-06-166-1/+24
* A guide to the request log lines format. (#8436)Michael Kaye2021-06-163-0/+46
* Add debug logging when we enter/exit Measure block (#10183)Erik Johnston2021-06-162-0/+6
* Fix requestOpenIdToken response: integer expires_in (#10175)Lukas Lihotzki2021-06-162-1/+2
* Fix broken links in documentation (#10180)Dirk Klimpel2021-06-1619-51/+53
* Make opentracing trace into event persistence (#10134)Richard van der Hoff2021-06-164-9/+99
* Merge branch 'master' into developErik Johnston2021-06-153-1/+13
|\
| * 1.36.0 v1.36.0 github/release-v1.36 release-v1.36Erik Johnston2021-06-153-1/+13
* | Remove support for unstable MSC1772 prefixes. (#10161)Patrick Cloke2021-06-153-16/+4
* | Remove the experimental flag for knocking and use stable prefixes / endpoints...Patrick Cloke2021-06-1513-96/+33
* | Fix 'ip_range_whitelist' not working for federation servers (#10115)Michael Kutzner2021-06-153-13/+19
* | Refactor `EventPersistenceQueue` (#10145)Richard van der Hoff2021-06-142-77/+89
* | Extend `ResponseCache` to pass a context object into the callback (#10157)Richard van der Hoff2021-06-145-37/+146
* | Notes on boolean columns in database schemas (#10164)Richard van der Hoff2021-06-112-0/+43
* | Merge tag 'v1.36.0rc2' into developErik Johnston2021-06-115-4/+12
|\|
| * Fixup changelog v1.36.0rc2Erik Johnston2021-06-111-1/+1
| * 1.36.0rc2Erik Johnston2021-06-115-4/+12
| * Only send a presence state to a destination once (#10165)Erik Johnston2021-06-112-13/+13
| * Fix sending presence over federation when using workers (#10163)Erik Johnston2021-06-112-6/+20
| * Fix bug when running presence off master (#10149)Erik Johnston2021-06-113-1/+17
* | Only send a presence state to a destination once (#10165)Erik Johnston2021-06-112-13/+13
* | Support for database schema version ranges (#9933)Richard van der Hoff2021-06-117-77/+206
* | Use the matching complement branch when running tests in CI. (#10160)Patrick Cloke2021-06-112-5/+24
* | Fix sending presence over federation when using workers (#10163)Erik Johnston2021-06-112-6/+20
* | Clean up a broken import in admin_cmd.py (#10154)Andrew Morgan2021-06-112-2/+1
* | Fix bug when running presence off master (#10149)Erik Johnston2021-06-113-1/+17
* | Add metrics to track how often events are `soft_failed` (#10156)Eric Eastwood2021-06-112-0/+8
* | Document how to see logger output when running the twisted tests (#10148)Eric Eastwood2021-06-113-13/+26
* | Mention that you need to configure max upload size in reverse proxy as well (...Aaron Raimist2021-06-103-0/+9
* | Update Complement run with Synapse-supported MSC-related build tags (#10155)Andrew Morgan2021-06-092-1/+2
* | Integrate knock rooms with the public rooms directory (#9359)Andrew Morgan2021-06-093-5/+11
* | Implement knock feature (#6739)Sorunome2021-06-0929-118/+1613
* | Limit the number of in-flight /keys/query requests from a single device. (#10...Patrick Cloke2021-06-094-173/+196
* | Clean up the interface for injecting opentracing over HTTP (#10143)Richard van der Hoff2021-06-094-92/+26
* | Add type hints to the federation server transport. (#10080)Patrick Cloke2021-06-085-75/+194
|/
* Make changelog lines consistent v1.36.0rc1Andrew Morgan2021-06-081-1/+1
* fix typo in changelogAndrew Morgan2021-06-081-1/+1
* 1.36.0rc1Andrew Morgan2021-06-0846-45/+69
* Fix logging context when opening new DB connection (#10141)Erik Johnston2021-06-082-3/+10
* Correct type hints for parse_string(s)_from_args. (#10137)Patrick Cloke2021-06-088-83/+132
* Name release branches just after major.minor (#10013)Dan Callahan2021-06-083-5/+6
* When joining a remote room limit the number of events we concurrently check s...Erik Johnston2021-06-085-256/+202
* Handle /backfill returning no events (#10133)Erik Johnston2021-06-082-13/+26
* More database opentracing (#10136)Richard van der Hoff2021-06-072-2/+6
* opentracing: use a consistent name for background processes (#10135)Richard van der Hoff2021-06-073-2/+5
* Make link in docs use HTTPS (#10130)Rohan Sharma2021-06-072-1/+2
* Fix broken link to README at root of repo (#10132)Chris Castle2021-06-072-1/+2
* Always update AS last_pos, even on no events (#10107)14mRh4X0r2021-06-073-17/+15
* Add missing type hints to the admin API servlets (#10105)Dirk Klimpel2021-06-076-40/+48
* Delete completes to-device messages earlier in /sync (#10124)Richard van der Hoff2021-06-072-10/+12
* Don't try and backfill the same room in parallel. (#10116)Erik Johnston2021-06-042-0/+9
* Limit number of events in a replication request (#10118)Erik Johnston2021-06-042-2/+4
* Enable Prometheus metrics for the jaeger client library (#10112)Richard van der Hoff2021-06-043-1/+5
* Compile and render Synapse's docs into a browsable, mobile-friendly and searc...Andrew Morgan2021-06-0335-54/+978
* Add OpenTracing for database activity. (#10113)Richard van der Hoff2021-06-033-33/+60
* Improve opentracing annotations for Notifier (#10111)Richard van der Hoff2021-06-032-33/+34
* Convert admin api docs to markdown (#10089)Andrew Morgan2021-06-039-1132/+1160
* r0.6.1 support: /rooms/:roomId/aliases endpoint (#9224)Travis Ralston2021-06-033-3/+3
* Merge branch 'master' into developPatrick Cloke2021-06-034-2/+16
|\
| * Clarify changelog. v1.35.1 github/release-v1.35 release-v1.35Patrick Cloke2021-06-031-1/+1
| * 1.35.1Patrick Cloke2021-06-034-2/+16
| * Do not show invite-only rooms in spaces summary (unless joined/invited). (#10...Patrick Cloke2021-06-032-10/+10
* | Add new admin APIs to remove media by media ID from quarantine. (#10044)Dirk Klimpel2021-06-025-10/+201
* | github actions: summarize Sytest results in an easy-to-read format (#10094)Richard van der Hoff2021-06-022-2/+3
* | Rewrite the KeyRing (#10035)Erik Johnston2021-06-028-492/+393
* | Do not show invite-only rooms in spaces summary (unless joined/invited). (#10...Patrick Cloke2021-06-022-10/+10
* | Make /sync do less state res (#10102)Erik Johnston2021-06-022-2/+3
* | Merge branch 'master' into developAndrew Morgan2021-06-015-2/+50
|\|
| * Merge v1.35.0rc3 into v1.35.0 due to incorrect tagging v1.35.0Andrew Morgan2021-06-011-5/+1
| * Indicate that there were no functional changes since v1.35.0rc3Andrew Morgan2021-06-011-0/+2
| * 1.35.0Andrew Morgan2021-06-014-2/+16
| * Announce deprecation of experimental `msc2858_enabled` option. (#10101)Erik Johnston2021-06-011-0/+1
| * CHANGELOGErik Johnston2021-05-281-2/+2
| * 1.35.0rc3Erik Johnston2021-05-285-4/+17
| * Merge remote-tracking branch 'origin/release-v1.35.0' into release-v1.35Erik Johnston2021-05-283-2/+10
| |\
| * | Limit the number of events sent over replication when persisting events. (#10...Brendan Abolivier2021-05-282-7/+11
| * | Log method and path when dropping request due to size limit (#10091)Erik Johnston2021-05-282-1/+4
| * | Allow response of `/send_join` to be larger. (#10093)Erik Johnston2021-05-283-1/+21
* | | add a cache to have_seen_event (#9953)Richard van der Hoff2021-06-0110-20/+205
* | | Fix opentracing inject to use the SpanContext, not the Span (#10074)Brad Murray2021-06-012-5/+6
* | | Set opentracing priority before setting other tags (#10092)Richard van der Hoff2021-05-285-11/+32
* | | Log method and path when dropping request due to size limit (#10091)Erik Johnston2021-05-282-1/+4
* | | Add `parse_strings_from_args` to get `prev_events` array (#10048)Eric Eastwood2021-05-282-43/+154
* | | Move some more endpoints off master (#10084)Erik Johnston2021-05-274-6/+10
* | | Make reason and score optional for report_event (#10077)Callum Brown2021-05-276-13/+105
* | | Limit the number of events sent over replication when persisting events. (#10...Brendan Abolivier2021-05-272-7/+11
* | | Merge tag 'v1.35.0rc2' into developErik Johnston2021-05-273-2/+11
|\ \ \ | | |/ | |/|
| * | 1.35.0rc2 v1.35.0rc2 github/release-v1.35.0 release-v1.35.0Erik Johnston2021-05-273-2/+10
| |/
| * Pass the origin when calculating the spaces summary over GET. (#10079)Patrick Cloke2021-05-272-1/+2
* | Fix up `BatchingQueue` (#10078)Erik Johnston2021-05-273-24/+125
* | Clarify security note regarding the domain Synapse is hosted on. (#9221)Denis Kasak2021-05-272-11/+36
* | Improve the error message printed by synctl when synapse fails to start. (#10...Richard van der Hoff2021-05-272-4/+9
* | Remove redundant, unmaintained `convert_server_keys` script. (#10055)Richard van der Hoff2021-05-272-108/+1
* | Remove redundant code to reload tls cert (#10054)Richard van der Hoff2021-05-274-25/+6
* | Combine `LruCache.invalidate` and `invalidate_many` (#9973)Richard van der Hoff2021-05-2712-52/+52
* | Remove the experimental spaces enabled flag. (#10063)Patrick Cloke2021-05-266-49/+9
* | Fix GitHub Actions lint for newsfragments (#10069)Dan Callahan2021-05-262-0/+7
* | Tweak wording of database recommendation in INSTALL.md (#10057)Aaron Raimist2021-05-262-5/+8
* | Tell CircleCI to build Docker images from `main` (#9906)Dan Callahan2021-05-262-1/+2
* | Add an admin API for unprotecting local media from quarantine (#10040)Dirk Klimpel2021-05-265-5/+151
* | Update CAPTCHA documentation to mention turning off verify origin feature (#1...Aaron Raimist2021-05-262-22/+29
|/
* 1.35.0rc1 v1.35.0rc1Erik Johnston2021-05-2539-38/+65
* Run complement with Synapse workers manually. (#10039)Patrick Cloke2021-05-243-7/+27
* Add missing type hints to synapse.util (#9982)Patrick Cloke2021-05-249-25/+39
* Fix docker image to not log at `/homeserver.log` (#10045)Sergio Miguéns2021-05-242-1/+4
* Remove tls_fingerprints option (#9280)Jerin J Titus2021-05-246-95/+1
* Fix --no-daemonize for synctl with workers (#9995)Richard van der Hoff2021-05-242-70/+33
* Fix off-by-one-error in synapse_port_db (#9991)Richard van der Hoff2021-05-245-9/+10
* Remove `keylen` from `LruCache`. (#9993)Richard van der Hoff2021-05-2411-55/+80
* Enable experimental spaces by default. (#10011)Patrick Cloke2021-05-244-2/+35
* Add missing entry to the table of contents of room admin API (#10043)Dirk Klimpel2021-05-242-0/+2
* Fix `get_state_ids_for_event` return type typo to match what the function act...Eric Eastwood2021-05-242-1/+2
* Don't hammer the database for destination retry timings every ~5mins (#10036)Erik Johnston2021-05-2110-76/+62
* Fix /upload 500'ing when presented a very large image (#10029)Michael Telatynski2021-05-213-0/+12
* Add a test for update_presence (#10033)Andrew Morgan2021-05-212-1/+47
* Remove unused properties from the SpaceSummaryHandler. (#10038)Patrick Cloke2021-05-212-2/+1
* Fixed removal of new presence stream states (#10014)Marek Matys2021-05-212-9/+10
* Add a batching queue implementation. (#10017)Erik Johnston2021-05-213-0/+323
* Add `Keyring.verify_events_for_server` and reduce memory usage (#10018)Erik Johnston2021-05-203-22/+94
* Use ijson to parse the response to `/send_join`, reducing memory usage. (#9958)Erik Johnston2021-05-207-58/+227
* Allow a user who could join a restricted room to see it in spaces summary. (#...Patrick Cloke2021-05-204-54/+254
* Merge branch 'master' of github.com:matrix-org/synapse into developAndrew Morgan2021-05-202-1/+2
|\
| * Update user_directory.md (#10016)Javier Junquera Sánchez2021-05-202-1/+2
* | Update the contrib grafana dashboard (#10001)Erik Johnston2021-05-192-644/+3558
* | Hardened systemd unit files (#9803)Savyasachee Jha2021-05-193-0/+102
* | Refactor checking restricted join rules (#10007)Patrick Cloke2021-05-184-51/+50
* | Use a database table to hold the users that should have full presence sent to...Andrew Morgan2021-05-1811-158/+479
* | Fix the allowed range of valid ordering characters for spaces. (#10002)Patrick Cloke2021-05-172-2/+3
* | Clarify comments in the space summary handler. (#9974)Patrick Cloke2021-05-172-5/+47
* | Merge branch 'master' into developErik Johnston2021-05-174-15/+25
|\|
| * Changelog v1.34.0 github/release-v1.34.0 release-v1.34.0Erik Johnston2021-05-171-6/+6
| * Update UPGRADE.rstErik Johnston2021-05-171-7/+4
| * 1.34.0Erik Johnston2021-05-173-3/+16
* | Split multiplart email sending into a dedicated handler (#9977)Brendan Abolivier2021-05-175-90/+122
* | Update postgres docs (#9989)Richard van der Hoff2021-05-143-103/+98
* | Run `black` on the scripts (#9981)Richard van der Hoff2021-05-148-76/+141
* | Minor `@cachedList` enhancements (#9975)Richard van der Hoff2021-05-146-20/+31
* | Remove unnecessary SystemRandom from SQLBaseStore (#9987)Dan Callahan2021-05-143-3/+3
* | Remove superfluous call to bool() (#9986)Dan Callahan2021-05-142-1/+2
* | Simplify exception handling in is_ascii. (#9985)Dan Callahan2021-05-142-3/+2
* | Use Python's secrets module instead of random (#9984)Dan Callahan2021-05-142-8/+12
* | Support enabling opentracing by user (#9978)Richard van der Hoff2021-05-145-17/+56
* | Update minimum supported version in postgres.md (#9988)Andrew Morgan2021-05-142-1/+2
* | Update SSO mapping providers documentation about unique IDs. (#9980)Patrick Cloke2021-05-132-7/+12
|/
* Incorporate changes from review v1.34.0rc1Brendan Abolivier2021-05-121-2/+6
* Refer and link to the upgrade notes rather than to the file nameBrendan Abolivier2021-05-121-1/+1
* 1.34.0rc1Brendan Abolivier2021-05-1236-35/+62
* Correctly ratelimit invites when creating a room (#9968)Brendan Abolivier2021-05-126-12/+157
* Change the format of access tokens away from macaroons (#5588)Richard van der Hoff2021-05-129-103/+78
* Run cache_joined_hosts_for_event in background (#9951)Erik Johnston2021-05-122-5/+41
* Tests for to-device messages (#9965)Richard van der Hoff2021-05-112-0/+202
* Sort child events according to MSC1772 for the spaces summary API. (#9954)Patrick Cloke2021-05-113-2/+151
* Support fetching the spaces summary via GET over federation. (#9947)Patrick Cloke2021-05-114-0/+29
* Send the `m.room.create` stripped event with invites (support MSC1772). (#9966)Patrick Cloke2021-05-115-5/+34
* Merge branch 'master' into developBrendan Abolivier2021-05-1110-70/+319
|\
| * Use link to advisory rather than to the CVE repo v1.33.2 github/release-v1.33.2 release-v1.33.2Brendan Abolivier2021-05-111-1/+1
| * 1.33.2Brendan Abolivier2021-05-114-2/+23
| * Merge pull request from GHSA-x345-32rc-8h85Richard van der Hoff2021-05-116-68/+296
* | Add config option to hide device names over federation (#9945)Aaron Raimist2021-05-114-1/+20