summary refs log tree commit diff
path: root/tests/rest (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v1.27.0rc2' into developPatrick Cloke2021-02-112-1/+12
|\
| * Backout changes for automatically calculating the public baseurl. (#9313)Patrick Cloke2021-02-112-1/+12
* | Convert some test cases to use HomeserverTestCase. (#9377)Patrick Cloke2021-02-111-28/+0
* | Merge pull request #9150 from Yoric/develop-contextDavid Teller2021-02-081-0/+84
|\ \
| * | FIXUP: linterDavid Teller2021-01-281-1/+3
| * | FIXUP: Now testing that the user is admin!David Teller2021-01-281-1/+35
| * | New API /_synapse/admin/rooms/{roomId}/context/{eventId}David Teller2021-01-281-0/+48
* | | Merge branch 'erikj/media_spam_checker' into developErik Johnston2021-02-041-0/+94
|\ \ \
| * | | Add check_media_file_for_spam spam checker hookErik Johnston2021-02-041-0/+94
| | |/ | |/|
* / | Social login UI polish (#9301)Richard van der Hoff2021-02-031-4/+12
|/ /
* | Add an admin API to get the current room state (#9168)Travis Ralston2021-02-021-0/+15
* | Merge branch 'social_login' into developRichard van der Hoff2021-02-012-18/+18
|\ \
| * | Replace username picker with a template (#9275)Richard van der Hoff2021-02-011-3/+2
| * | Fix SSO on workers (#9271)Richard van der Hoff2021-02-012-16/+5
| * | Split out a separate endpoint to complete SSO registration (#9262)Richard van der Hoff2021-02-011-1/+13
* | | Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-291-0/+35
* | | Ratelimit 3PID /requestToken API (#9238)Erik Johnston2021-01-281-6/+84
| |/ |/|
* | Merge branch 'social_login' into developRichard van der Hoff2021-01-271-0/+92
|\|
| * Implement MSC2858 support (#9183)Richard van der Hoff2021-01-271-0/+92
* | Add an admin API for shadow-banning users. (#9209)Patrick Cloke2021-01-252-6/+66
* | Return a 404 if no valid thumbnail is found. (#9163)Patrick Cloke2021-01-211-1/+24
* | Add tests for List Users Admin API (#9045)Dirk Klimpel2021-01-211-27/+196
|/
* Prefix idp_id with "oidc-" (#9189)Richard van der Hoff2021-01-211-1/+1
* Give `public_baseurl` a default value (#9159)Richard van der Hoff2021-01-201-9/+0
* Fix bugs in handling clientRedirectUrl, and improve OIDC tests (#9127, #9128)Richard van der Hoff2021-01-182-81/+127
* Fix test failure due to bad mergeRichard van der Hoff2021-01-151-1/+3
* Add an admin API endpoint to protect media. (#9086)Patrick Cloke2021-01-151-3/+5
* Improve UsernamePickerTestCase (#9112)Richard van der Hoff2021-01-153-7/+111
* Add a test for wrong user returned by SSORichard van der Hoff2021-01-131-0/+27
* Add a test for UI-Auth-via-SSO (#9082)Richard van der Hoff2021-01-132-37/+199
* Remove user's avatar URL and displayname when deactivated. (#8932)Dirk Klimpel2021-01-123-3/+228
* Also support remote users on the joined_rooms admin API. (#8948)David Teller2021-01-111-6/+52
* Removes unnecessary declarations in the tests for the admin API. (#9063)Dirk Klimpel2021-01-116-17/+0
* Add some tests for the IDP picker flowRichard van der Hoff2021-01-072-3/+191
* Fix type hints in test_login.pyRichard van der Hoff2021-01-071-24/+54
* black-format tests/rest/client/v1/test_login.pyRichard van der Hoff2021-01-071-11/+6
* Skip unit tests which require optional dependencies (#9031)Richard van der Hoff2021-01-073-11/+33
* Combine the SSO Redirect Servlets (#9015)Richard van der Hoff2021-01-041-1/+1
* Drop the unused local_invites table. (#8979)Patrick Cloke2020-12-291-1/+0
* Support PyJWT v2.0.0. (#8986)Patrick Cloke2020-12-221-4/+12
* Allow server admin to get admin bit in rooms where local user is an admin (#8...Erik Johnston2020-12-181-0/+138
* Allow re-using a UI auth validation for a period of time (#8970)Patrick Cloke2020-12-181-31/+63
* Fix `UsersListTestCase` (#8964)Richard van der Hoff2020-12-171-6/+4
* Fix a bug that deactivated users appear in the directory (#8933)Dirk Klimpel2020-12-171-1/+49
* Make search statement in List Room and User Admin API case-insensitive (#8931)Dirk Klimpel2020-12-172-3/+105
* Convert internal pusher dicts to attrs classes. (#8940)Patrick Cloke2020-12-161-1/+1
* Merge pull request #8951 from matrix-org/rav/username_picker_2Richard van der Hoff2020-12-161-1/+1
|\
| * Test `get_extra_attributes` fallbackRichard van der Hoff2020-12-151-1/+1
* | lintRichard van der Hoff2020-12-152-2/+1
* | Remove spurious "SynapseRequest" result from `make_request"Richard van der Hoff2020-12-1536-861/+660
* | Remove redundant reading of SynapseRequest.argsRichard van der Hoff2020-12-151-9/+1
* | remove 'response' result from `_get_shared_rooms`Richard van der Hoff2020-12-151-8/+9
* | Replace `request.code` with `channel.code`Richard van der Hoff2020-12-155-11/+11
|/
* Add number of local devices to Room Details Admin API (#8886)Dirk Klimpel2020-12-111-0/+34
* Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-111-0/+16
* Add X-Robots-Tag header to stop crawlers from indexing media (#8887)Aaron Raimist2020-12-081-0/+13
* Call set_avatar_url with target_user, not user_id (#8872)Will Hunt2020-12-071-1/+6
* Add additional validation to pusher URLs. (#8865)Patrick Cloke2020-12-041-1/+1
* Fix errorcode for disabled registration (#8867)Richard van der Hoff2020-12-031-0/+1
* Merge pull request #8858 from matrix-org/rav/sso_uiaRichard van der Hoff2020-12-022-18/+192
|\
| * UIA: offer only available auth flowsRichard van der Hoff2020-12-022-18/+192
* | remove unused FakeResponse (#8864)Richard van der Hoff2020-12-021-26/+0
* | Apply an IP range blacklist to push and key revocation requests. (#8821)Patrick Cloke2020-12-027-8/+8
|/
* Allow specifying room version in 'RestHelper.create_room_as' and add typing (...Andrew Morgan2020-12-021-2/+25
* Support "identifier" dicts in UIA (#8848)Richard van der Hoff2020-12-011-8/+25
* Fix broken testcase (#8851)Richard van der Hoff2020-12-011-1/+0
* Simplify the way the `HomeServer` object caches its internal attributes. (#8...Jonathan de Jong2020-11-302-9/+12
* Remove deprecated `/_matrix/client/*/admin` endpoints (#8785)Dirk Klimpel2020-11-254-7/+115
* Fix tests on develop (#8777)Erik Johnston2020-11-181-16/+0
* Merge pull request #8761 from matrix-org/rav/test_request_renderingRichard van der Hoff2020-11-1736-678/+57
|\
| * Remove redundant `HomeserverTestCase.render`Richard van der Hoff2020-11-1632-587/+0
| * Remove redundant calls to `render()`Richard van der Hoff2020-11-163-20/+8
| * Make `make_request` actually render the requestRichard van der Hoff2020-11-166-59/+34
| * Fix the URL in the URL preview testsRichard van der Hoff2020-11-161-19/+22
* | Add admin API for logging in as a user (#8617)Erik Johnston2020-11-171-2/+243
|/
* Merge pull request #8757 from matrix-org/rav/pass_site_to_make_requestRichard van der Hoff2020-11-166-29/+97
|\
| * Merge branch 'develop' into rav/pass_site_to_make_requestRichard van der Hoff2020-11-165-13/+7
| |\
| * | use global make_request() directly where we have a custom ResourceRichard van der Hoff2020-11-155-19/+71
| * | pass a Site into make_requestRichard van der Hoff2020-11-151-6/+25
| * | pass a Site into RestHelperRichard van der Hoff2020-11-151-5/+6
* | | Move `wait_until_result` into `FakeChannel` (#8758)Richard van der Hoff2020-11-161-3/+3
| |/ |/|
* | Rename `create_test_json_resource` to `create_test_resource` (#8759)Richard van der Hoff2020-11-164-10/+6
* | Add a `custom_headers` param to `make_request` (#8760)Richard van der Hoff2020-11-161-4/+6
|/
* Add an admin API for users' media statistics (#8700)Dirk Klimpel2020-11-051-0/+485
* Add `displayname` to Shared-Secret Registration for admins (#8722)Dirk Klimpel2020-11-051-2/+119
* Consolidate purge table lists to prevent desyncronisation (#8713)Andrew Morgan2020-11-041-67/+38
* Fix unit tests (#8689)Erik Johnston2020-10-291-1/+1
* Add ability for access tokens to belong to one user but grant access to anoth...Erik Johnston2020-10-291-0/+1
* Add an admin APIs to allow server admins to list users' pushers (#8610)Dirk Klimpel2020-10-281-0/+124
* Add admin API to list users' local media (#8647)Dirk Klimpel2020-10-271-0/+282
* Split admin API for reported events into a detail and a list view (#8539)Dirk Klimpel2020-10-261-13/+183
* Add an admin api to delete local media. (#8519)Dirk Klimpel2020-10-261-0/+568
* Fix a bug in the joined_rooms admin API (#8643)Dirk Klimpel2020-10-261-1/+15
* Add field `total` to device list in admin API (#8644)Dirk Klimpel2020-10-261-0/+17
* Remove some extraneous @unittest.INFOs on unit tests (#8592)Andrew Morgan2020-10-202-2/+0
* guard against accidental modificationRichard van der Hoff2020-10-131-0/+20
* Allow ThirdPartyRules modules to replace event contentRichard van der Hoff2020-10-131-4/+4
* Fix message duplication if something goes wrong after persisting the event (#...Erik Johnston2020-10-131-1/+1
* Allow modules to create and send events into rooms (#8479)Andrew Morgan2020-10-091-1/+27
* Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-094-4/+8
* Additional tests for third-party event rules (#8468)Richard van der Hoff2020-10-061-13/+71
* Merge pull request #8467 from matrix-org/rav/fix_3pevent_rulesRichard van der Hoff2020-10-061-1/+1
|\
| * Fix third-party event modules for `check_visibility_can_be_modified` checkRichard van der Hoff2020-10-051-1/+1
* | Update default room version to 6 (#8461)Richard van der Hoff2020-10-051-1/+10
|/
* Allow ThirdPartyEventRules modules to manipulate public room state (#8292)Andrew Morgan2020-10-051-12/+19
* Make token serializing/deserializing async (#8427)Erik Johnston2020-09-301-8/+22
* Various clean ups to room stream tokens. (#8423)Erik Johnston2020-09-291-4/+4
* Only assert valid next_link params when provided (#8417)Andrew Morgan2020-09-291-0/+6
* Fixed a bug with reactivating users with the admin API (#8362)Dirk Klimpel2020-09-221-0/+14
* Admin API for reported events (#8217)Dirk Klimpel2020-09-221-0/+382
* Create function to check for long names in devices (#8364)Dionysis Grigoropoulos2020-09-221-1/+1
* Admin API for querying rooms where a user is a member (#8306)Dirk Klimpel2020-09-181-2/+94
* Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-181-1/+1
* Allow appservice users to /login (#8320)Will Hunt2020-09-181-1/+133
* Add the topic and avatar to the room details admin API (#8305)Tulir Asokan2020-09-141-0/+2
* Show a confirmation page during user password reset (#8004)Andrew Morgan2020-09-101-1/+28
* Do not error when thumbnailing invalid files (#8236)Patrick Cloke2020-09-091-10/+29
* Don't remember `enabled` of deleted push rules and properly return 404 for mi...reivilibre2020-09-091-0/+448
* Add a config option for validating 'next_link' parameters against a domain wh...Andrew Morgan2020-09-081-7/+96
* Allow for make_awaitable's return value to be re-used. (#8261)Patrick Cloke2020-09-081-3/+3
* Stop sub-classing object (#8249)Patrick Cloke2020-09-043-5/+5
* Re-implement unread counts (again) (#8059)Brendan Abolivier2020-09-021-2/+155
* Add /user/{user_id}/shared_rooms/ api (#7785)Will Hunt2020-09-021-0/+138
* Do not yield on awaitables in tests. (#8193)Patrick Cloke2020-08-271-2/+6
* Convert stats and related calls to async/await (#8192)Patrick Cloke2020-08-271-5/+4
* Remove remaining is_guest argument uses from get_room_data calls (#8181)Andrew Morgan2020-08-261-10/+2
* Do not propagate typing notifications from shadow-banned users. (#8176)Patrick Cloke2020-08-261-0/+48
* Remove unused parameter from, and add safeguard in, get_room_data (#8174)Andrew Morgan2020-08-261-1/+1
* Do not propagate profile changes of shadow-banned users into rooms. (#8157)Patrick Cloke2020-08-262-157/+274
* Fix rate limiting unit tests. (#8167)Patrick Cloke2020-08-261-13/+14
* Merge tag 'v1.19.1rc1' into developBrendan Abolivier2020-08-252-4/+93
|\
| * Fix join ratelimiter breaking profile updates and idempotency (#8153)Brendan Abolivier2020-08-242-4/+93
* | Stop shadow-banned users from sending non-member events. (#8142)Patrick Cloke2020-08-241-1/+54
* | Allow capping a room's retention policy (#8104)Brendan Abolivier2020-08-241-28/+66
* | Fix flaky shadow-ban tests. (#8152)Patrick Cloke2020-08-241-1/+3
* | Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-201-0/+100
* | Switch the JSON byte producer from a pull to a push producer. (#8116)Patrick Cloke2020-08-192-13/+7
|/
* Add type hints to handlers.message and events.builder (#8067)Erik Johnston2020-08-121-1/+3
* Add health check endpoint (#8048)Erik Johnston2020-08-071-0/+34
* Revert #7736 (#8039)Brendan Abolivier2020-08-062-175/+2
* Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-064-12/+14
* Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-061-1/+1
* Rename database classes to make some sense (#8033)Erik Johnston2020-08-051-2/+2
* Prevent join->join membership transitions changing member count (#7977)Andrew Morgan2020-08-031-1/+23
* Convert federation client to async/await. (#7975)Patrick Cloke2020-07-302-4/+4
* Re-implement unread counts (#7736)Brendan Abolivier2020-07-292-2/+175
* Add an option to disable purge in delete room admin API (#7964)Dirk Klimpel2020-07-281-2/+55
* Convert tests/rest/admin/test_room.py to unix file endings (#7953)Andrew Morgan2020-07-271-1447/+1447
* Support oEmbed for media previews. (#7920)Patrick Cloke2020-07-271-8/+134
* Convert more of the media code to async/await (#7873)Patrick Cloke2020-07-241-1/+4
* Add admin endpoint to get members in a room. (#7842)Michael Albert2020-07-161-0/+46
* Allow accounts to be re-activated from the admin APIs. (#7847)Patrick Cloke2020-07-151-0/+47
* Return the proper 403 Forbidden error during errors with JWT logins. (#7844)Patrick Cloke2020-07-151-21/+22
* Add delete room admin endpoint (#7613)Dirk Klimpel2020-07-141-0/+395
* Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-141-6/+100
* Do not use canonicaljson to magically handle decoding bytes from JSON. (#7802)Patrick Cloke2020-07-101-1/+1
* Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-093-3/+3
* Stop populating unused table `local_invites`. (#7793)Richard van der Hoff2020-07-071-1/+0
* isort 5 compatibility (#7786)Will Hunt2020-07-051-3/+1
* Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-031-30/+145
* add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675)Sorunome2020-06-241-3/+7
* Allow local media to be marked as safe from being quarantined. (#7718)Patrick Cloke2020-06-221-72/+65
* Fetch from the r0 media path instead of the unspecced v1. (#7714)Patrick Cloke2020-06-171-1/+1
* Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-163-7/+6
* Allow new users to be registered via the admin API even if the monthly active...Dirk Klimpel2020-06-051-15/+163
* Add device management to admin API (#7481)Dirk Klimpel2020-06-051-0/+541
* Add support for webp thumbnailing (#7586)WGH2020-06-051-36/+99
* Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-055-37/+48
* Fix a bug in automatic user creation with m.login.jwt. (#7585)Olof Johansson2020-06-011-0/+153
* Email notifications for new users when creating via the Admin API. (#7267)Dirk Klimpel2020-06-011-0/+75
* Convert sending mail to async/await. (#7557)Erik Johnston2020-05-221-2/+2
* Allow expired accounts to logout (#7443)Andrew Morgan2020-05-142-2/+103
* Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-141-45/+10
|\
| * Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-131-45/+10
* | Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-111-88/+216
|\|
| * Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-081-88/+216
* | Add room details admin endpoint (#7317)Manuel Stahl2020-05-071-0/+41
|/
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-301-0/+40
* Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-291-1/+1
* Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-281-0/+2
* Revert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t...Brendan Abolivier2020-04-232-1/+62
* Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-222-592/+680
* Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-151-0/+55
* Fix the parameters of a test fixture (#7243)Zay11Zay2020-04-141-1/+1
* Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-092-4/+297
* Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-091-3/+39
* Merge pull request #7157 from matrix-org/rev.outbound_device_pokes_testsRichard van der Hoff2020-03-302-4/+4
|\
| * Remove spurious "name" parameter to `default_config`Richard van der Hoff2020-03-242-4/+4
* | Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-1/+8
* | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-271-0/+288
* | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+302
* | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+179
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-261-1/+67
* | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-241-8/+8
|/
* Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-172-15/+33
* Revert "Add options to disable setting profile info for prevent changes. (#70...Richard van der Hoff2020-03-171-303/+0
* Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-0/+303
|\
| * lint, fix testsdklimpel2020-03-091-2/+2
| * updates after reviewdklimpel2020-03-091-10/+7
| * lintdklimpel2020-03-091-10/+8
| * add testsdklimpel2020-03-091-0/+308
* | Merge branch 'master' into developBrendan Abolivier2020-03-031-0/+111
|\ \
| * | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-021-3/+29
| * | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-021-28/+181
| |\ \
| | * | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-021-28/+181
| * | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-021-0/+85
| |/ /
* | / Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-031-0/+160
| |/ |/|
* | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-281-32/+186
* | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error hand...Andrew Morgan2020-02-261-0/+59
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-211-13/+15
|/
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-191-0/+17
|\
| * Make room alias lists peekableRichard van der Hoff2020-02-191-0/+17
* | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-191-3/+13
|/
* Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-181-1/+69
* Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-171-1/+3
* Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-121-0/+16
* Admin api to add an email address (#6789)Dirk Klimpel2020-02-071-2/+17
* MSC2260: Block direct sends of m.room.aliases events (#6794)Richard van der Hoff2020-01-302-33/+15
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-4/+389
* Lint + changelogBrendan Abolivier2020-01-221-3/+1
* Remove unused importBrendan Abolivier2020-01-221-1/+1
* Add tests for thumbnailingBrendan Abolivier2020-01-221-3/+45
* Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-01-221-4/+11
* Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-201-0/+27
* Fix changing password via user admin API. (#6730)Erik Johnston2020-01-201-0/+13
* Fix purge_room admin API (#6711)Erik Johnston2020-01-151-3/+1
* Add `local_current_membership` table (#6655)Erik Johnston2020-01-152-12/+9
* Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-132-0/+378
* Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-092-338/+465
* Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-0/+41
* Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-083-4/+131
* Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-061-0/+130
* Merge release-v1.7.1 into developRichard van der Hoff2019-12-181-0/+127
|\
| * Incorporate reviewBrendan Abolivier2019-12-161-5/+0
| * LintBrendan Abolivier2019-12-161-2/+1
| * Add test caseBrendan Abolivier2019-12-161-0/+133
* | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-0/+2
* | Port handlers.account_validity to async/await.Erik Johnston2019-12-101-2/+1
|/
* Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-091-1/+3
|\
| * Fixup functions to consistently return deferredsErik Johnston2019-12-061-1/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-062-1/+12
|\|
| * Fixup testsErik Johnston2019-12-052-1/+12
* | Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-051-1/+1
|/
* Remove underscore from SQLBaseStore functionsErik Johnston2019-12-041-1/+1
* Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-043-100/+381
|\
| * Un-remove room purge testBrendan Abolivier2019-12-041-0/+72
| * Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse in...Brendan Abolivier2019-12-041-1/+1
| |\
| | * Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-11-263-1/+213
| | |\
| * | \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-045-3/+477
| |\ \ \ | | |/ / | |/| |
| * | | LintBrendan Abolivier2019-11-051-30/+41