summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-101-9/+16
* Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-041-0/+81
|\
| * Lint (again)Brendan Abolivier2019-10-031-3/+1
| * LintBrendan Abolivier2019-10-031-5/+5
| * Add test caseBrendan Abolivier2019-10-031-0/+83
* | Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-39/+0
* | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-022-0/+47
|\ \ | |/ |/|
| * Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-021-0/+11
| |\
| | * Fix errors storing large retry intervals.Erik Johnston2019-10-021-0/+11
| * | Fix fetching censored redactions from DBErik Johnston2019-10-021-0/+36
| |/
* | okBrendan Abolivier2019-09-271-1/+3
* | LintBrendan Abolivier2019-09-271-7/+1
* | Add test to validate the changeBrendan Abolivier2019-09-271-13/+57
|/
* Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-262-9/+178
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-253-31/+103
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-253-31/+103
| |\
| | * Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-12/+17
| | * Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-251-10/+16
| | * Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-252-21/+82
* | | Test that pruning of old user IPs worksErik Johnston2019-09-241-0/+71
|/ /
* | Test background updateErik Johnston2019-09-231-0/+79
* | Query devices table for last seen info.Erik Johnston2019-09-231-1/+0
|/
* Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-173-4/+138
* Fix well-known lookups with the federation certificate whitelist (#5997)Amber Brown2019-09-141-0/+40
* Fix for structured logging tests stomping on logs (#6023)Amber Brown2019-09-132-6/+23
* Ensure support users can be registered even if MAU limit is reachedJason Robinson2019-09-111-0/+18
* Fix commentsErik Johnston2019-09-111-2/+2
* Add test for admin redaction ratelimiting.Erik Johnston2019-09-111-0/+25
* Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-usersJason Robinson2019-09-091-2/+27
|\
| * Only count real users when checking for auto-creation of auto-join roomJason Robinson2019-09-091-2/+27
* | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-1/+76
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_red...Erik Johnston2019-09-058-119/+544
| |\ \
| * | | Fix testErik Johnston2019-09-051-1/+3
| * | | Make redaction retention period configurableErik Johnston2019-09-051-1/+3
| * | | Censor redactions in DB after a monthErik Johnston2019-08-301-0/+71
* | | | Add a build info metric to Prometheus (#6005)Amber Brown2019-09-101-2/+20
| |_|/ |/| |
* | | Servers-known-about statistic (#5981)Amber Brown2019-09-073-60/+125
| |/ |/|
* | Fix and refactor room and user stats (#5971)Erik Johnston2019-09-042-113/+538
* | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-306-6/+6
|/
* Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-281-0/+1
|\
| * Fix registration testHalf-Shot2019-08-231-0/+1
* | Config templating (#5900)Jorik Schellekens2019-08-283-1/+196
* | Implement a structured logging output system. (#5680)Amber Brown2019-08-284-2/+456
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_l...Erik Johnston2019-08-222-39/+50
|\|
| * Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-221-35/+48
| |\
| | * Change jitter to be a factor rather than absolute valueErik Johnston2019-08-201-2/+2
| | * Retry well known on fail.Erik Johnston2019-08-151-33/+46
| * | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-201-4/+2
| |/
* | Remove test debugsErik Johnston2019-08-203-3/+0
* | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-152-5/+66
|/
* Retry well-known lookup before expiry.Erik Johnston2019-08-132-2/+71
* Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-131-22/+21
|\
| * Move well known lookup into a separate clasErik Johnston2019-08-071-20/+19
| * Add a lower bound for TTL on well known results.Erik Johnston2019-08-061-2/+2
* | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-0/+70
|\ \ | |/ |/|
| * Handle loops in redaction eventsRichard van der Hoff2019-07-301-0/+70
* | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-011-0/+37
|\ \
| * | Add testsBrendan Abolivier2019-08-011-0/+37
* | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownErik Johnston2019-07-311-6/+6
|\ \ \
| * | | Share SSL options for well-known requestsErik Johnston2019-07-311-6/+6
| |/ /
* / / Remove DelayedCall debugging from test runs (#5787)Amber Brown2019-07-311-6/+0
|/ /
* | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-301-1/+36
|\ \
| * | Add unit test for current state membership bg updateErik Johnston2019-07-231-1/+36
* | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-303-3/+2
| |/ |/|
* | Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-3/+74
* | Convert RedactionTestCase to modern test style (#5768)Richard van der Hoff2019-07-261-36/+38
* | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-251-3/+87
* | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-242-6/+17
|\ \
| * | Fix servlet metric names (#5734)Jorik Schellekens2019-07-242-6/+17
* | | Replace returnValue with return (#5736)Amber Brown2019-07-2313-25/+25
| |/ |/|
* | Refactor Keyring._start_key_lookupsRichard van der Hoff2019-07-191-29/+0
|/
* Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-181-3/+1
* Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-181-3/+113
* Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-171-0/+20
* More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-172-0/+160
* Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-152-1/+211
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi...Erik Johnston2019-07-0522-82/+234
| |\
| * | Fixup from review comments.Erik Johnston2019-07-041-5/+5
| * | Add basic function to get all data for a user out of synapseErik Johnston2019-07-022-1/+211
* | | Implement access token expiry (#5660)Richard van der Hoff2019-07-125-11/+136
* | | Add a mechanism for per-test configs (#5657)Richard van der Hoff2019-07-121-1/+54
* | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-111-7/+24
* | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-1/+1
* | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-106-58/+24
* | | Include the original event in /relations (#5626)Andrew Morgan2019-07-091-0/+5
* | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+47
|\ \ \
| * | | LintBrendan Abolivier2019-07-081-2/+2
| * | | Add test caseBrendan Abolivier2019-07-081-0/+47
* | | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-081-25/+28
|/ / /
* | | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-9/+59
* | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-6/+18
| |/ |/|
* | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-053-6/+137
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0419-65/+65
* | Fix media repo breaking (#5593)Amber Brown2019-07-022-12/+33
|/
* Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-292-18/+47
* Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-281-1/+114
* Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
* Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-244-4/+4
* Run Black. (#5482)Amber Brown2019-06-2056-710/+684
* Run as background process and fix commentsErik Johnston2019-06-191-1/+1
* Add experimental option to reduce extremities.Erik Johnston2019-06-181-0/+41
* Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-171-23/+70
|\
| * Add testErik Johnston2019-06-071-1/+28
| * Refactor email testsErik Johnston2019-06-071-22/+42
* | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-141-0/+79
|\ \
| * | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-141-0/+79
* | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-141-10/+10
|\ \ \
| * | | Prometheus histograms are cumalativeErik Johnston2019-06-141-10/+10
* | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-141-25/+42
|/ / /
* | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-141-0/+45
* | | fix prometheus rendering errorAmber H. Brown2019-06-141-38/+23
* | | Expose statistics on extrems to prometheus (#5384)Amber Brown2019-06-133-80/+206
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-116-24/+253
|\ \ \
| * | | Bump bleach version so that tests can run on old deps.Erik Johnston2019-06-114-24/+0
| * | | Change password reset links to /_matrix.Erik Johnston2019-06-112-0/+253
| |/ /
* | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-106-106/+341
|\| |
| * | Merge pull request #5417 from matrix-org/rav/shared_ssl_contextErik Johnston2019-06-106-106/+341
| |\ \
| | * | fix ci on py2, againRichard van der Hoff2019-06-101-1/+1
| | * | fix CI on python 2.7Richard van der Hoff2019-06-101-6/+4
| | * | Tests for SSL certs for federation connectionsRichard van der Hoff2019-06-106-106/+343
| | |/
* | | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_msErik Johnston2019-06-101-1/+49
|\| |
| * | Fix key verification when key stored with null valid_until_msErik Johnston2019-06-101-1/+49
| |/
* | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-101-0/+35
|\ \ | |/ |/|
| * Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-0/+35
* | Prevent multiple device list updates from breaking a batch send (#5156)Andrew Morgan2019-06-061-0/+69
* | Set default room version to v4. (#5379)Neil Johnson2019-06-062-1/+8
* | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-1/+0
* | Stop hardcoding trust of old matrix.org key (#5374)Richard van der Hoff2019-06-062-15/+29
* | Merge pull request #5359 from matrix-org/rav/enable_tls_verificationRichard van der Hoff2019-06-061-3/+9
|\ \
| * \ Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verificationRichard van der Hoff2019-06-051-3/+59
| |\ \
| * | | Validate federation server TLS certificates by default.Richard van der Hoff2019-06-051-3/+9
* | | | Merge pull request #5353 from matrix-org/rav/verify_key_loggingRichard van der Hoff2019-06-061-10/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Associate a request_name with each verify request, for loggingRichard van der Hoff2019-06-051-10/+8
| |/ /
* / / Fix background updates to handle redactions/rejections (#5352)Erik Johnston2019-06-061-3/+59
|/ /
* | Don't bomb out on direct key fetches as soon as one failsRichard van der Hoff2019-06-041-7/+5
* | Enforce validity period on server_keys for fed requests. (#5321)Richard van der Hoff2019-06-031-27/+108
* | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-033-3/+2
* | Merge pull request #5309 from matrix-org/rav/limit_displayname_lengthRichard van der Hoff2019-06-011-2/+60
|\ \
| * | add some testsRichard van der Hoff2019-06-011-2/+60
* | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-311-5/+10
|\ \ \
| * | | Move delta from +10% to -10%Brendan Abolivier2019-05-311-2/+2
| * | | Make max_delta equal to period * 10%Brendan Abolivier2019-05-311-17/+1
| * | | TypoBrendan Abolivier2019-05-281-1/+1
| * | | Allow configuring a range for the account validity startup jobBrendan Abolivier2019-05-281-0/+21
| | |/ | |/|
* | | Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremitiesErik Johnston2019-05-301-0/+248
|\ \ \
| * | | Add testErik Johnston2019-05-291-0/+248
* | | | Implement the SHHS complexity API (#5216)Amber Brown2019-05-301-0/+90
|/ / /
* | | Merge pull request #5251 from matrix-org/rav/server_keys/01-check_sigRichard van der Hoff2019-05-281-9/+75
|\ \ \
| * | | Require sig from origin server on perspectives responsesRichard van der Hoff2019-05-231-9/+75
* | | | Simplification to Keyring.wait_for_previous_lookups. (#5250)Richard van der Hoff2019-05-241-2/+2
* | | | Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchersErik Johnston2019-05-231-6/+28
|\| | |
| * | | Factor out KeyFetchers from KeyRingRichard van der Hoff2019-05-231-6/+28
* | | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+5
|/ / /
* | | Store key validity time in the storage layerRichard van der Hoff2019-05-232-22/+44
* | | Rewrite store_server_verify_key to store several keys at once (#5234)Richard van der Hoff2019-05-232-16/+42
* | | Room Statistics (#4338)Amber Brown2019-05-212-0/+268
| |/ |/|
* | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactionsErik Johnston2019-05-211-1/+26
|\ \
| * | Block attempts to annotate the same event twiceErik Johnston2019-05-201-1/+26
* | | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati...Brendan Abolivier2019-05-211-0/+55
|\ \ \ | |/ / |/| / | |/
| * Add startup background job for account validityBrendan Abolivier2019-05-171-0/+55
* | Rename relation types to match MSCErik Johnston2019-05-201-11/+11
* | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+539
|\ \
| * | Fixup commentsErik Johnston2019-05-201-2/+2
| * | Correctly update aggregation counts after redactionErik Johnston2019-05-201-0/+37
| * | Make tests use different user for each reaction it sendsErik Johnston2019-05-171-12/+68
| * | Add basic editing supportErik Johnston2019-05-161-9/+82
| * | Check that event is visible in new APIsErik Johnston2019-05-161-1/+1
| * | Add aggregations APIErik Johnston2019-05-161-3/+248
| * | Add simple pagination APIErik Johnston2019-05-151-0/+30
| * | Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+98
| * | Merge branch 'erikj/fix_config_ratelimiting' into erikj/testErik Johnston2019-05-141-1/+2
| |\ \
* | | | Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-201-0/+7
* | | | Merge pull request #5196 from matrix-org/babolivier/per_room_profilesBrendan Abolivier2019-05-171-1/+69
|\ \ \ \ | | |_|/ | |/| |
| * | | LintBrendan Abolivier2019-05-161-1/+0
| * | | LintBrendan Abolivier2019-05-161-1/+3
| * | | Forgot copyrightBrendan Abolivier2019-05-161-0/+1
| * | | Add test caseBrendan Abolivier2019-05-161-1/+67
* | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-162-2/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Terms might not be the last stageDavid Baker2019-05-131-1/+1
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec...David Baker2019-05-131-11/+11
| |\ \ \
| * | | | And now I realise why the test is failing...David Baker2019-05-131-1/+8
* | | | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-12/+8
* | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_arrayErik Johnston2019-05-151-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Expose DataStore._get_events as get_events_as_listErik Johnston2019-05-141-1/+1
* | | | Use correct config option for ratelimiting in testsErik Johnston2019-05-141-1/+2
|/ / /
* | | Migrate all tests to use the dict-based config format instead of hanging item...Amber Brown2019-05-1321-203/+238
* | | Add ability to blacklist ip ranges for federation traffic (#5043)Andrew Morgan2019-05-131-0/+71
| |/ |/|
* | URL preview blacklisting fixes (#5155)Andrew Morgan2019-05-101-11/+11
|/
* Run Black on the tests again (#5170)Amber Brown2019-05-1053-1169/+828
* Fix bogus imports in tests (#5154)Brendan Abolivier2019-05-083-5/+6
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-082-1/+123
* Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-081-0/+169
* Remove the requirement to authenticate for /admin/server_version. (#5122)Richard van der Hoff2019-05-072-26/+26
* Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-0215-20/+23
* Move admin api impl to its own packageRichard van der Hoff2019-05-0116-37/+63
* Config option for verifying federation certificates (MSC 1711) (#4967)Andrew Morgan2019-04-251-1/+2
* Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-1723-327/+928
|\
| * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-1/+99
| |\
| * | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-112-2/+2
| * | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-092-3/+52
| |\ \
| * | | Rewrite Datastore.get_server_verify_keysRichard van der Hoff2019-04-091-3/+50
| * | | Rewrite test_keys as a HomeserverTestCaseRichard van der Hoff2019-04-081-19/+15
| * | | Fix from_server buglet in get_keys_from_perspectivesRichard van der Hoff2019-04-081-0/+1
| * | | Merge pull request #5001 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2019-04-081-0/+130
| |\ \ \
| | * | | test for get_keys_from_perspectivesRichard van der Hoff2019-04-041-0/+67
| | * | | add a test for get_keys_from_serverRichard van der Hoff2019-04-041-0/+63
| * | | | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-042-1/+66
| * | | | Add unit test for deleting groupsErik Johnston2019-04-031-0/+124
| * | | | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-031-2/+2
| |/ / /
| * | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986)Richard van der Hoff2019-04-031-107/+104
| * | | Remove presence lists (#4989)Neil Johnson2019-04-031-118/+0
| * | | Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-023-49/+196
| * | | Neilj/fix threepid auth check (with tests) (#4474)Neil Johnson2019-04-011-0/+32
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-019-26/+32
| * | | Merge pull request #4942 from matrix-org/erikj/fix_presenceErik Johnston2019-03-281-1/+175
| |\ \ \
| | * | | Review commentsErik Johnston2019-03-281-5/+9
| | * | | Add unit testsErik Johnston2019-03-271-1/+171
| * | | | Move replication.tcp.streams into a packageRichard van der Hoff2019-03-271-1/+1
| |/ / /
* | | / Add management endpoints for account validityBrendan Abolivier2019-04-171-8/+87
| |_|/ |/| |
* | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-1/+99
| |/ |/|
* | Add account expiration featureBrendan Abolivier2019-04-092-3/+52
|/
* Make federation endpoints more tolerant of trailing slashes v2 (#4935)Andrew Morgan2019-03-261-3/+3
* Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-254-0/+148
* Use an explicit dbname for postgres connections in the tests. (#4928)Richard van der Hoff2019-03-251-18/+16
* Merge pull request #4869 from matrix-org/erikj/yaml_loadErik Johnston2019-03-222-3/+3
|\
| * Use yaml safe_loadErik Johnston2019-03-222-3/+3
* | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913)Amber Brown2019-03-224-230/+123
* | Remove trailing slashes from outbound federation requests and retry on 400 (#...Andrew Morgan2019-03-212-0/+101
|\ \ | |/ |/|
| * lintAndrew Morgan2019-03-201-1/+1
| * New test, fix issuesAndrew Morgan2019-03-201-0/+45
| * Fix comments. v0.99.2 -> v0.99.3Andrew Morgan2019-03-201-1/+1
| * Federation test fixed!Andrew Morgan2019-03-201-2/+5
| * Better exception handlingAndrew Morgan2019-03-181-4/+1
| * Correct var nameAndrew Morgan2019-03-131-0/+54
| * i should have given up x3Andrew Morgan2019-03-131-39/+0
| * i should have given up x2Andrew Morgan2019-03-131-0/+39
| * Switch to wrapper function around _send_requestAndrew Morgan2019-03-131-2/+2
| * Correct argument nameAndrew Morgan2019-03-121-2/+2
| * Cleaner way of implementing trailing slashesAndrew Morgan2019-03-121-2/+4
| * and againAndrew Morgan2019-03-111-1/+1
| * Fix syntax errorAndrew Morgan2019-03-111-1/+1
| * We're calling different functions nowAndrew Morgan2019-03-111-2/+2
* | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_roomsErik Johnston2019-03-211-1/+65
|\ \
| * | isortErik Johnston2019-03-211-1/+1
| * | Deny peeking into rooms that have been blockedErik Johnston2019-03-211-1/+65
* | | Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-211-1/+74
|\ \ \
| * | | Fix typo and add descriptionErik Johnston2019-03-211-1/+5
| |/ /
| * | Rejig testcase to make it more extensibleErik Johnston2019-03-211-17/+22
| * | Remove debugErik Johnston2019-03-211-1/+0
| * | Add testsErik Johnston2019-03-211-1/+66
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 16:48:04 +0000