summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Add a comment re #1691Richard van der Hoff2020-09-211-1/+5
* Fix a bad merge from release-v1.20.0. (#8354)Patrick Cloke2020-09-182-1/+2
* Merge tag 'v1.20.0rc5' into developPatrick Cloke2020-09-1810-28/+128
|\
| * Add a note about including the changes from 1.19.3. v1.20.0rc5Patrick Cloke2020-09-181-0/+2
| * Tweak wording in the changelog.Patrick Cloke2020-09-181-2/+2
| * 1.20.0rc5Patrick Cloke2020-09-186-5/+23
| * Merge tag 'v1.19.3' into release-v1.20.0Patrick Cloke2020-09-183-5/+18
| |\
| | * 1.19.3 v1.19.3 github/release-v1.19.3 release-v1.19.3Andrew Morgan2020-09-184-2/+16
| | * Use _check_sigs_and_hash_and_fetch to validate backfill requests (#8350)Andrew Morgan2020-09-182-5/+4
| * | Intelligently select extremities used in backfill. (#8349)Erik Johnston2020-09-184-20/+67
| * | Add flags to /versions about whether new rooms are encrypted by default. (#8343)Patrick Cloke2020-09-182-0/+20
* | | Admin API for querying rooms where a user is a member (#8306)Dirk Klimpel2020-09-185-2/+160
* | | Catch-up after Federation Outage (bonus): Catch-up on Synapse Startup (#8322)reivilibre2020-09-1810-5/+218
* | | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-18133-281/+272
* | | Allow appservice users to /login (#8320)Will Hunt2020-09-183-11/+173
* | | Update test logging to be able to accept braces (#8335)Jonathan de Jong2020-09-182-2/+2
* | | Merge remote-tracking branch 'origin/release-v1.20.0' into developErik Johnston2020-09-184-17/+54
|\| |
| * | Fix ratelimiting for federation `/send` requests. (#8342)Erik Johnston2020-09-184-17/+54
| * | blacklist MSC2753 sytests until it's implemented in synapse (#8285)Matthew Hodgson2020-09-172-0/+9
* | | Move lint dependencies to extras_require (#8330)Jonathan de Jong2020-09-174-12/+10
* | | Remove obsolete __future__ imports (#8337)Jonathan de Jong2020-09-1719-40/+2
* | | Use admin_patterns for all admin APIs. (#8331)Patrick Cloke2020-09-177-26/+20
* | | Fix a potential bug of UnboundLocalError (#8329)Jonathan de Jong2020-09-172-5/+9
* | | Switch metaclass initialization to python 3-compatible syntax (#8326)Jonathan de Jong2020-09-168-26/+16
* | | Merge tag 'v1.20.0rc4' into developPatrick Cloke2020-09-163-2/+25
|\| |
| * | 1.20.0rc4 v1.20.0rc4Patrick Cloke2020-09-162-1/+8
| * | Merge remote-tracking branch 'origin/master' into release-v1.20.0Patrick Cloke2020-09-163-2/+17
| |\|
| * | Merge branch 'erikj/fix_origin_check' into release-v1.20.0Erik Johnston2020-09-162-3/+5
| |\ \
* | \ \ Merge branch 'master' into developErik Johnston2020-09-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 1.19.2 v1.19.2 github/release-v1.19.2 release-v1.19.2Erik Johnston2020-09-164-2/+18
| * | | Merge branch 'erikj/fix_origin_check' into release-v1.19.2Erik Johnston2020-09-162-3/+5
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'erikj/fix_origin_check' into developErik Johnston2020-09-162-3/+5
|\ \ \ \ | | |/ / | |/| |
| * | | NewsfileErik Johnston2020-09-161-0/+1
| * | | Don't assume that an event has an origin fieldErik Johnston2020-09-161-3/+4
| |/ /
* | | Catch-up after Federation Outage (split, 4): catch-up loop (#8272)reivilibre2020-09-155-5/+338
* | | Use slots in attrs classes where possible (#8296)Patrick Cloke2020-09-1422-50/+33
* | | Fix typos in comments.Patrick Cloke2020-09-145-6/+6
* | | Add the topic and avatar to the room details admin API (#8305)Tulir Asokan2020-09-144-1/+9
* | | Improve SAML error messages (#8248)Patrick Cloke2020-09-149-185/+178
* | | Add experimental support for sharding event persister. Again. (#8294)Erik Johnston2020-09-1418-80/+211
* | | Merge tag 'v1.20.0rc3' into developPatrick Cloke2020-09-119-17/+176
|\ \ \ | | |/ | |/|
| * | Clarify changelog. v1.20.0rc3Patrick Cloke2020-09-111-1/+1
| * | 1.20.0rc3Patrick Cloke2020-09-113-2/+10
| * | Fix the exception that is raised when invalid JSON is encountered. (#8291)Patrick Cloke2020-09-106-2/+167
| * | Remove shared rooms info from upgrade/workers doc as it's still experimental ...Andrew Morgan2020-09-102-14/+0
* | | Make `StreamToken.room_key` be a `RoomStreamToken` instance. (#8281)Erik Johnston2020-09-1116-99/+114
* | | Use TLSv1.2 for fake servers in tests (#8208)Dan Callaghan2020-09-102-1/+2
* | | Add /_synapse/client to the reverse proxy docs (#8227)Andrew Morgan2020-09-104-3/+39
* | | Clean up `Notifier.on_new_room_event` code path (#8288)Erik Johnston2020-09-106-37/+44
* | | Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-1016-90/+271
* | | Merge branch 'release-v1.20.0' into developRichard van der Hoff2020-09-103-3/+13
|\| |
| * | 1.20.0rc2 v1.20.0rc2Richard van der Hoff2020-09-093-2/+10
| * | Fix /notifications and pushers misbehaving because of unread counts (#8280)Brendan Abolivier2020-09-082-2/+4
* | | Do not error when thumbnailing invalid files (#8236)Patrick Cloke2020-09-095-22/+106
* | | Remove some unused distributor signals (#8216)Patrick Cloke2020-09-097-141/+18
* | | Fixup pusher pool notifications (#8287)Erik Johnston2020-09-098-8/+24
* | | Revert "Fixup pusher pool notifications"Erik Johnston2020-09-097-23/+8
* | | Fixup pusher pool notificationsErik Johnston2020-09-097-8/+23
* | | blacklist MSC2753 sytests until it's implemented in synapse (#8285)Matthew Hodgson2020-09-092-0/+9
* | | Don't remember `enabled` of deleted push rules and properly return 404 for mi...reivilibre2020-09-095-13/+610
* | | Add types to async_helpers (#8260)Patrick Cloke2020-09-083-51/+88
* | | Fix mypy error on develop (#8282)Erik Johnston2020-09-082-3/+7
* | | Include method in thumbnail media name (#7124)DeepBlueV7.X2020-09-086-1/+181
* | | Add types to StreamToken and RoomStreamToken (#8279)Erik Johnston2020-09-085-91/+95
* | | Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-085-17/+204
* | | Clean up types for PaginationConfig (#8250)Erik Johnston2020-09-087-86/+52
* | | Use the right constructor for log records (#8278)Richard van der Hoff2020-09-082-3/+4
* | | Fix `MultiWriterIdGenerator.current_position`. (#8257)Erik Johnston2020-09-083-6/+88
* | | Merge tag 'v1.20.0rc1' into developRichard van der Hoff2020-09-08116-122/+85
|\| |
| * | fix typo v1.20.0rc1Richard van der Hoff2020-09-081-1/+1
| * | s/fixes/fix/Richard van der Hoff2020-09-081-2/+2
| * | 1.20.0rc1Richard van der Hoff2020-09-08116-123/+80
| * | Systemd docs: configure workers to start after main process. (#8276)Richard van der Hoff2020-09-082-0/+6
* | | Directly import json from the standard library. (#8259)Patrick Cloke2020-09-085-6/+7
* | | Allow for make_awaitable's return value to be re-used. (#8261)Patrick Cloke2020-09-0812-70/+56
* | | Rename 'populate_stats_process_rooms_2' background job back to 'populate_stat...Andrew Morgan2020-09-084-39/+35
* | | Merge remote-tracking branch 'origin/release-v1.20.0' into developRichard van der Hoff2020-09-0811-36/+122
|\| |
| * | Only add rows to the push actions table if the event notifies or should be ma...Brendan Abolivier2020-09-072-1/+7
| * | Avoid table-scanning users at startup (#8271)Richard van der Hoff2020-09-072-11/+15
| * | Fix unread count failing on NULL values (#8270)Brendan Abolivier2020-09-072-1/+7
| * | Add more logging to debug slow startup (#8264)Richard van der Hoff2020-09-075-7/+33
| * | Refuse to upgrade database on worker processes (#8266)Richard van der Hoff2020-09-072-17/+62
* | | Fix stack overflow when logging system encounters an error (#8268)Richard van der Hoff2020-09-072-2/+24
* | | Bump canonicaljson to version 1.4.0 (#8262)Alexandre Morignot2020-09-072-1/+2
* | | Run database updates in a transaction (#8265)Richard van der Hoff2020-09-072-5/+23
* | | Add tests for `last_successful_stream_ordering` (#8258)reivilibre2020-09-072-0/+77
* | | Merge branch 'release-v1.20.0' into developRichard van der Hoff2020-09-068-39/+25
|\| |
| * | Add cross-signing sigs to the `keys` object (#8234)Richard van der Hoff2020-09-043-34/+18
| * | Unread counts fixes (#8254)Brendan Abolivier2020-09-043-4/+5
| * | Fix a regression from calling read_templates. (#8252)Patrick Cloke2020-09-042-1/+2
* | | In light of #8255, use BIGINTs for destination_rooms (#8256)reivilibre2020-09-042-1/+2
* | | Catch up after Federation Outage (split, 2): Track last successful stream ord...reivilibre2020-09-044-0/+71
* | | Catch-up after Federation Outage (split, 1) (#8230)reivilibre2020-09-047-7/+201
|/ /
* | Fix type signature in simple_select_one_onecol and friends (#8241)reivilibre2020-09-042-10/+8
* | Stop sub-classing object (#8249)Patrick Cloke2020-09-04168-292/+293
* | Revert "Add experimental support for sharding event persister. (#8170)" (#8242)Brendan Abolivier2020-09-0419-206/+78
* | Add type hints to more handlers (#8244)Erik Johnston2020-09-035-79/+110
* | Remove obsolete order field in `send_new_transaction` (#8245)reivilibre2020-09-034-28/+23
* | Split fetching device keys and signatures into two transactions (#8233)Richard van der Hoff2020-09-032-44/+66
* | Fix typing for `@cached` wrapped functions (#8240)Erik Johnston2020-09-035-20/+121
* | Remove useless changelog about reverting a #8239.Patrick Cloke2020-09-031-1/+0
* | Revert pinning of setuptools (#8239)Patrick Cloke2020-09-034-6/+2
* | Fix typing for SyncHandler (#8237)Erik Johnston2020-09-034-10/+13
* | wrap `_get_e2e_device_keys_and_signatures_txn` in a non-txn method (#8231)Richard van der Hoff2020-09-033-17/+40
* | Add an overload for simple_select_one_onecol_txn. (#8235)Patrick Cloke2020-09-022-0/+25
* | Convert runInteraction to async/await (#8156)Patrick Cloke2020-09-022-15/+15
* | Add StreamStore to mypy (#8232)Erik Johnston2020-09-025-20/+66
* | Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-0212-122/+457
* | Refactor `_get_e2e_device_keys_for_federation_query_txn` (#8225)Richard van der Hoff2020-09-022-11/+7
* | Add experimental support for sharding event persister. (#8170)Erik Johnston2020-09-0218-77/+206
* | Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-028-1/+270
* | Do not try to store invalid data in the stats table (#8226)Patrick Cloke2020-09-022-8/+27
* | Convert the main methods run by the reactor to async. (#8213)Patrick Cloke2020-09-023-21/+18
* | Make _get_e2e_device_keys_and_signatures_txn return an attrs (#8224)Richard van der Hoff2020-09-023-20/+41
* | Fix errors when updating the user directory with invalid data (#8223)Patrick Cloke2020-09-014-1/+19
* | Explain better what GDPR-erased means (#8189)Brendan Abolivier2020-09-012-3/+6
* | Convert additional databases to async/await part 3 (#8201)Patrick Cloke2020-09-017-87/+121
* | Convert appservice code to async/await. (#8207)Patrick Cloke2020-09-012-8/+12
* | Rename `_get_e2e_device_keys_txn` (#8222)Richard van der Hoff2020-09-013-6/+9
* | Convert additional databases to async/await (#8199)Patrick Cloke2020-09-017-137/+147
* | Convert the well known resolver to async (#8214)Patrick Cloke2020-09-015-34/+53
* | Convert additional databases to async/await part 2 (#8200)Patrick Cloke2020-09-0115-81/+111
* | Make MultiWriterIDGenerator work for streams that use negative stream IDs (#8...Erik Johnston2020-09-013-11/+134
* | Do not install setuptools 50.0. (#8212)Patrick Cloke2020-09-013-1/+6
* | Move and rename `get_devices_with_keys_by_user` (#8204)Richard van der Hoff2020-09-016-49/+67
* | Rename `get_e2e_device_keys` to better reflect its purpose (#8205)Richard van der Hoff2020-08-294-19/+14
* | Add a comment about _LimitedHostnameResolverRichard van der Hoff2020-08-291-0/+7
* | Convert ReadWriteLock to async/await. (#8202)Patrick Cloke2020-08-284-33/+39
* | Fix incorrect return signatureAndrew Morgan2020-08-281-1/+1
* | Fix `wait_for_stream_position` for multiple waiters. (#8196)Erik Johnston2020-08-283-5/+6
* | Convert `event_push_actions`, `registration`, and `roommember` datastores to ...Patrick Cloke2020-08-284-160/+169
* | Only return devices with keys from `/federation/v1/user/devices/` (#8198)Richard van der Hoff2020-08-282-3/+2
* | Convert state and stream stores and related code to async (#8194)Patrick Cloke2020-08-287-45/+51
* | Ensure that the OpenID Connect remote ID is a string. (#8190)Patrick Cloke2020-08-283-2/+43
* | Convert additional database code to async/await. (#8195)Patrick Cloke2020-08-2811-175/+246
* | Define StateMap as immutable and add a MutableStateMap type. (#8183)Patrick Cloke2020-08-288-32/+52
* | Move and refactor LoginRestServlet helper methods (#8182)Andrew Morgan2020-08-283-55/+94
* | Do not yield on awaitables in tests. (#8193)Patrick Cloke2020-08-2715-131/+230
* | Convert stats and related calls to async/await (#8192)Patrick Cloke2020-08-278-77/+78
* | Convert simple_delete to async/await. (#8191)Patrick Cloke2020-08-275-37/+90
* | Convert calls of async database methods to async (#8166)Patrick Cloke2020-08-2714-84/+114
* | simple_search_list_txn should return None, not 0. (#8187)Patrick Cloke2020-08-272-4/+4
* | Fix missing _add_persisted_position (#8179)Erik Johnston2020-08-273-3/+52
* | Convert additional database methods to async (select list, search, insert_man...Patrick Cloke2020-08-278-84/+67
* | Convert simple_update* and simple_select* to async (#8173)Patrick Cloke2020-08-2719-133/+164
* | Reduce run-times of tests by advancing the reactor less (#7757)Andrew Morgan2020-08-277-8/+9
* | Merge branch 'master' into developBrendan Abolivier2020-08-273-1/+13
|\|
| * 1.19.1 v1.19.1 github/release-v1.19.1 release-v1.19.1Brendan Abolivier2020-08-273-1/+13
* | Update debian systemd service to use Type=notify (#8169)Dexter Chua2020-08-272-1/+7
* | Remove remaining is_guest argument uses from get_room_data calls (#8181)Andrew Morgan2020-08-262-10/+3
* | Do not propagate typing notifications from shadow-banned users. (#8176)Patrick Cloke2020-08-266-24/+102
* | Remove unused parameter from, and add safeguard in, get_room_data (#8174)Andrew Morgan2020-08-264-10/+14
* | Add required Debian dependencies to allow docker builds on the arm platform (...Christopher May-Townsend2020-08-262-3/+11
* | Allow running mypy directly. (#8175)Patrick Cloke2020-08-263-51/+51
* | Update the test federation client to handle streaming responses (#8130)Richard van der Hoff2020-08-262-8/+28
* | Do not propagate profile changes of shadow-banned users into rooms. (#8157)Patrick Cloke2020-08-265-160/+291
* | Make SlavedIdTracker.advance have same interface as MultiWriterIDGenerator (#...Erik Johnston2020-08-2612-15/+16
* | Convert simple_select_one and simple_select_one_onecol to async (#8162)Patrick Cloke2020-08-2625-113/+220
* | Fix rate limiting unit tests. (#8167)Patrick Cloke2020-08-262-13/+15
* | Add functions to `MultiWriterIdGen` used by events stream (#8164)Erik Johnston2020-08-254-3/+145
* | Do not allow send_nonmember_event to be called with shadow-banned users. (#8158)Patrick Cloke2020-08-252-5/+35
* | Merge tag 'v1.19.1rc1' into developBrendan Abolivier2020-08-255-26/+129
|\|
| * Changelog fixes v1.19.1rc1Brendan Abolivier2020-08-251-1/+1
| * 1.19.1rc1Brendan Abolivier2020-08-254-3/+11
| * Fix join ratelimiter breaking profile updates and idempotency (#8153)Brendan Abolivier2020-08-244-25/+119
| * Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-244-6/+119
* | Make StreamIdGen `get_next` and `get_next_mult` async (#8161)Erik Johnston2020-08-2514-49/+54
* | Wording fixes to 'name' user admin api filter (#8163)Andrew Morgan2020-08-254-5/+7
* | Fix missing double-backtick in RST documentAndrew Morgan2020-08-251-1/+1
* | Search in columns 'name' and 'displayname' in the admin users endpoint (#7377)Manuel Stahl2020-08-254-15/+27
* | Add type hints for state. (#8140)Patrick Cloke2020-08-2410-203/+420
* | Stop shadow-banned users from sending non-member events. (#8142)Patrick Cloke2020-08-248-42/+155
* | Allow capping a room's retention policy (#8104)Brendan Abolivier2020-08-246-107/+127
* | Add healthcheck for default localhost 8008 port on /health endpoint. (#8147)Christopher May-Townsend2020-08-243-0/+34
* | Fix flaky shadow-ban tests. (#8152)Patrick Cloke2020-08-242-1/+4
* | Don't fail /submit_token requests on incorrect session ID if request_token_in...Brendan Abolivier2020-08-245-6/+68
* | Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-214-6/+119
* | Micro-optimisations to get_auth_chain_ids (#8132)Richard van der Hoff2020-08-212-23/+18
* | Allow denying or shadow banning registrations via the spam checker (#8034)Patrick Cloke2020-08-2014-18/+258
* | Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-207-31/+226
* | Be more tolerant of membership events in unknown rooms (#8110)Richard van der Hoff2020-08-203-6/+28
* | Improve the error code when trying to register using a name reserved for gues...Patrick Cloke2020-08-202-1/+4
* | Use the JSON encoder without whitespace in more places. (#8124)Patrick Cloke2020-08-209-27/+21
* | Add more types to synapse.storage.database. (#8127)Patrick Cloke2020-08-203-222/+367
* | Ensure a group ID is valid before trying to get rooms for it. (#8129)Patrick Cloke2020-08-202-0/+5
* | Do not assume calls to runInteraction return Deferreds. (#8133)Patrick Cloke2020-08-207-31/+41
* | Close the database connection we create during startup (#8131)Richard van der Hoff2020-08-192-1/+11
* | Remove `ChainedIdGenerator`. (#8123)Erik Johnston2020-08-197-95/+26
* | Switch the JSON byte producer from a pull to a push producer. (#8116)Patrick Cloke2020-08-195-46/+53
* | Updated docs: Added note about missing 308 redirect support. (#8120)Ryan Cole2020-08-192-0/+13
* | Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-1920-62/+85
* | Convert runWithConnection to async. (#8121)Patrick Cloke2020-08-193-15/+15
* | Remove the unused inlineCallbacks code-paths in the caching code (#8119)Patrick Cloke2020-08-193-52/+15
* | Separate `get_current_token` into two. (#8113)Erik Johnston2020-08-196-20/+47
* | Convert events worker database to async/await. (#8071)Patrick Cloke2020-08-1812-97/+106
* | Add a link to the matrix-synapse-rest-password-provider. (#8111)Patrick Cloke2020-08-182-0/+2
* | Fix the return type of send_nonmember_events. (#8112)Patrick Cloke2020-08-183-5/+17
* | Remove : from allowed client_secret chars (#8101)Andrew Morgan2020-08-184-6/+16
* | Rename changelog from bugfix to misc.Patrick Cloke2020-08-181-0/+0
* | Iteratively encode JSON responses to avoid blocking the reactor. (#8013)Patrick Cloke2020-08-185-13/+94
* | Return the previous stream token if a non-member event is a duplicate. (#8093)Patrick Cloke2020-08-182-10/+16
* | Add resources.consent conditional dependency back (#8107)Andrew Morgan2020-08-182-20/+1
* | Convert some of the general database methods to async (#8100)Patrick Cloke2020-08-1713-59/+69
* | Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-1715-290/+310
* | Merge branch 'master' into developOlivier Wilkinson (reivilibre)2020-08-173-6/+11
|\|
| * Changelog changes v1.19.0 github/release-v1.19.0 release-v1.19.0Olivier Wilkinson (reivilibre)2020-08-171-5/+4
| * 1.19.0Olivier Wilkinson (reivilibre)2020-08-173-4/+10
* | Convert stream database to async/await. (#8074)Patrick Cloke2020-08-1711-227/+224
* | Add a shadow-banned flag to users. (#8092)Patrick Cloke2020-08-1412-12/+83
* | Convert pusher databases to async/await. (#8075)Patrick Cloke2020-08-144-95/+90
* | Convert receipts and events databases to async/await. (#8076)Patrick Cloke2020-08-144-82/+80
* | Add type hints to synapse.handlers.room (#8090)Erik Johnston2020-08-143-39/+69
* | Remove some unused database functions. (#8085)Patrick Cloke2020-08-147-244/+19
* | Convert misc database code to async (#8087)Patrick Cloke2020-08-1411-64/+39
* | Remove a space at the start of a changelog entry.Patrick Cloke2020-08-131-1/+1
* | Merge tag 'v1.19.0rc1' into developOlivier Wilkinson (reivilibre)2020-08-1372-71/+70
|\|
| * More changelog tweaks v1.19.0rc1Olivier Wilkinson (reivilibre)2020-08-131-4/+4
| * More changelog tweaksOlivier Wilkinson (reivilibre)2020-08-131-4/+8
| * Remove unwanted changelog lineOlivier Wilkinson (reivilibre)2020-08-131-1/+0
| * 1.19.0rc1Olivier Wilkinson (reivilibre)2020-08-1372-71/+67
* | Run `remove_push_actions_from_staging` in foreground (#8081)Richard van der Hoff2020-08-132-3/+2
* | Drop federation transmission queues during a significant remote outage. (#7864)reivilibre2020-08-132-0/+23
* | Fix unawaited coroutine error in tests. (#8072)Patrick Cloke2020-08-132-10/+21
|/
* Convert the roommember database to async/await. (#8070)Patrick Cloke2020-08-125-242/+116
* Convert devices database to async/await. (#8069)Patrick Cloke2020-08-125-176/+220
* Add type hints to handlers.message and events.builder (#8067)Erik Johnston2020-08-127-41/+61
* Convert account data, device inbox, and censor events databases to async/awai...Patrick Cloke2020-08-125-87/+99
* Convert appservice, group server, profile and more databases to async (#8066)Patrick Cloke2020-08-129-116/+91
* Fix typing for notifier (#8064)Erik Johnston2020-08-126-16/+38
* Merge pull request #8060 from matrix-org/erikj/type_serverErik Johnston2020-08-118-403/+269
|\
| * Merge remote-tracking branch 'origin/develop' into erikj/type_serverErik Johnston2020-08-1119-117/+406
| |\
| * | Add comment explaining castErik Johnston2020-08-111-0/+2
| * | Handle optional dependencies for Oidc and SamlErik Johnston2020-08-111-5/+9
| * | NewsfileErik Johnston2020-08-111-0/+1
| * | Change HomeServer definition to work with typing.Erik Johnston2020-08-117-399/+264
* | | Convert tags and metrics databases to async/await (#8062)Patrick Cloke2020-08-114-65/+64
* | | Converts event_federation and registration databases to async/await (#8061)Patrick Cloke2020-08-117-177/+150
| |/ |/|
* | Auto set logging filter (#8051)Erik Johnston2020-08-114-21/+17
|\ \
| * | Update changelog.d/8051.miscErik Johnston2020-08-111-1/+1
| * | NewsfileErik Johnston2020-08-111-0/+1
| * | Move setting of Filter into code.Erik Johnston2020-08-113-21/+16
* | | Add typing info to Notifier (#8058)Erik Johnston2020-08-115-52/+91
|/ /
* | Reduce INFO logging (#8050)Erik Johnston2020-08-114-25/+74
* | Change the default log config to reduce disk I/O and storage (#8040)Erik Johnston2020-08-113-10/+73
* | Implement login blocking based on SAML attributes (#8052)Richard van der Hoff2020-08-116-11/+159
|/
* Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2020-08-102-4/+3
|\
| * Stop uploading -py3 docker images (#8056)Richard van der Hoff2020-08-102-4/+3
* | Add an assertion on prev_events in create_new_client_event (#8041)Richard van der Hoff2020-08-103-0/+14
* | Implement new experimental push rules (#7997)Brendan Abolivier2020-08-105-14/+245
|\ \
| * | TypoBrendan Abolivier2020-08-101-1/+1