summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5638 from matrix-org/babolivier/invite-jsonAndrew Morgan2020-02-171-4/+5
|\
* | Include the original event in /relations (#5626)Andrew Morgan2020-02-171-0/+5
|\|
| * 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)Andrew Morgan2020-02-171-25/+28
|\| |
| * | 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)Andrew Morgan2020-02-171-9/+59
|\|
| * 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 Morgan2020-02-171-6/+18
|\|
| * Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-6/+18
* | Fixes to the federation rate limiter (#5621)Andrew Morgan2020-02-173-6/+137
|\|
| * Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-053-6/+137
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-143-4/+3
* | Fix signedjson deleted methodAndrew Morgan2020-02-141-4/+12
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-1419-65/+65
|\|
| * 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)Andrew Morgan2020-02-142-12/+33
|\|
| * Fix media repo breaking (#5593)Amber Brown2019-07-022-12/+33
* | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-142-18/+47
|\|
| * 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 ...Andrew Morgan2020-02-141-1/+114
|\|
| * 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)Andrew Morgan2020-02-134-4/+4
|\|
| * Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-244-4/+4
* | Run Black. (#5482)Andrew Morgan2020-02-1313-99/+97
|\|
| * Run Black. (#5482)Amber Brown2019-06-2056-710/+684
* | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1158-979/+803
* | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsAndrew Morgan2020-02-101-1/+1
|\|
| * Run as background process and fix commentsErik Johnston2019-06-191-1/+1
* | Add experimental option to reduce extremities.Andrew Morgan2020-02-101-0/+41
|\|
| * Add experimental option to reduce extremities.Erik Johnston2019-06-181-0/+41
* | Merge commit 'dd927b29e' into dinsic-release-v1.1.0Andrew Morgan2020-02-101-23/+70
|\|
| * 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
| |\ \
* | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveAndrew Morgan2020-02-101-10/+10
|\| | |
| * | | 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
* | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-1014-15/+905
|\ \ \ \
| * | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-051-0/+1
| * | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-0/+28
| * | | | Hide expired users from user directory, optionally show on renewal (#13)Andrew Morgan2019-11-141-0/+135
| * | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-121-0/+9
| * | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-061-0/+10
| * | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-015-6/+382
| * | | | Fixup testsBrendan Abolivier2019-10-042-4/+12
| * | | | Lint (again)Brendan Abolivier2019-10-041-3/+1
| * | | | LintBrendan Abolivier2019-10-041-5/+5
| * | | | Add test caseBrendan Abolivier2019-10-041-0/+83
| * | | | Fix git messing upBrendan Abolivier2019-09-271-2/+3
| * | | | okBrendan Abolivier2019-09-271-1/+3
| * | | | LintBrendan Abolivier2019-09-271-0/+51
| * | | | Add unit tests for strip_invalid_mxid_charactersBrendan Abolivier2019-09-191-1/+21
| * | | | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-101-0/+64
| |\ \ \ \
| | * | | | LintBrendan Abolivier2019-09-061-1/+0
| | * | | | Fix bogus conflict resolutionBrendan Abolivier2019-09-061-0/+1
| | * | | | Merge branch 'dinsic' into babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-061-8/+112
| | |\ \ \ \
| | * | | | | Don't process revoked/redacted events as part of the room's membership infoBrendan Abolivier2019-09-061-0/+10
| | * | | | | Don't treat 3PID revokation as a new 3PID inviteBrendan Abolivier2019-09-061-0/+55
| * | | | | | Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_...Brendan Abolivier2019-09-091-3/+2
| | |/ / / / | |/| | | |
| * | | | | Add testsBrendan Abolivier2019-09-051-0/+105
| |/ / / /
* | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheusAndrew Morgan2020-02-101-38/+23
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fix prometheus rendering errorAmber H. Brown2019-06-141-38/+23
* | | | | Expose statistics on extrems to prometheus (#5384)Andrew Morgan2020-02-103-80/+206
|\| | | | | |/ / / |/| | |
| * | | 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
| |\ \ \
| * \ \ \ Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-106-106/+341
| |\ \ \ \
| * \ \ \ \ Merge pull request #5415 from matrix-org/erikj/fix_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
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-291-2/+3
* | | | | | | Merge branch 'dinsic' into babolivier/dinsic-message-retentionBrendan Abolivier2019-08-282-2/+141
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #5812 from matrix-org/babolivier/account-validity-messages dinsic_2019-08-12Michael Kaye2019-08-121-0/+37
| |\ \ \ \ \ \ \
| | * | | | | | | Add testsBrendan Abolivier2019-08-011-0/+37
| * | | | | | | | Fix status code for forbidden eventsBrendan Abolivier2019-07-251-6/+6
| * | | | | | | | Turns out the default preset is public_chatBrendan Abolivier2019-07-241-5/+3
| * | | | | | | | Add test caseBrendan Abolivier2019-07-241-2/+106
| |/ / / / / / /
* / / / / / / / Implement per-room message retention policiesBrendan Abolivier2019-08-281-0/+319
|/ / / / / / /
* | | | | | | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09Brendan Abolivier2019-07-091-0/+47
|\ \ \ \ \ \ \
| * | | | | | | LintBrendan Abolivier2019-07-091-2/+2
| * | | | | | | Add test caseBrendan Abolivier2019-07-091-0/+47
* | | | | | | | Add testsBrendan Abolivier2019-07-031-4/+52
* | | | | | | | Add test case for #5574Brendan Abolivier2019-06-281-0/+108
|/ / / / / / /
* | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
* | | | | | | Add tests for constraints on changing the rule for a roomBrendan Abolivier2019-06-181-0/+60
* | | | | | | Add tests for 3PID invitesBrendan Abolivier2019-06-181-12/+146
* | | | | | | Remove unused importBrendan Abolivier2019-06-181-1/+0
* | | | | | | Add tests for inviting with access rulesBrendan Abolivier2019-06-181-2/+102
* | | | | | | Remove unused importsBrendan Abolivier2019-06-181-3/+0
* | | | | | | LintBrendan Abolivier2019-06-181-1/+1
* | | | | | | Add tests for room creation hookBrendan Abolivier2019-06-181-0/+136
* | | | | | | Merge branch 'babolivier/third_party_event_rules' into dinsicBrendan Abolivier2019-06-141-0/+79
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-141-0/+79
| | |_|_|/ / | |/| | | |
* | | | | | Fix testBrendan Abolivier2019-06-141-1/+2
* | | | | | 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
* | | | | | Merge branch 'dinsic' into babolivier/userdir_hide_usersBrendan Abolivier2019-06-1228-204/+2324
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into dinsicBrendan Abolivier2019-06-1224-202/+1496
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | 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 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
| | | |/ /
| | * / / Fix key verification when key stored with null valid_until_msErik Johnston2019-06-101-1/+49
| | |/ /
| | * | 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
| | |\ \ \
| | * \ \ \ 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 branch 'master' into dinsicBrendan Abolivier2019-06-115-2/+828
| |\ \ \ \
| | * | | | Add testErik Johnston2019-05-301-0/+248
| | |/ / /
| | * | | 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
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | 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
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ 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
* | | | | | | | | | | LintBrendan Abolivier2019-06-101-2/+2
* | | | | | | | | | | LintBrendan Abolivier2019-06-101-1/+1
* | | | | | | | | | | Add test caseBrendan Abolivier2019-06-101-0/+51
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'babolivier/account_validity_send_mail_auth' into dinsic dinsic_2019-06-10Brendan Abolivier2019-06-101-0/+35
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-0/+35
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'babolivier/account_validity_job_delta' of github.com:matrix-org... dinsic_2019-05-31Erik 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 #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-221-0/+181
|\ \ \ \ \ \ \ \
| * | | | | | | | Test whole dict instead of individual fieldsBrendan Abolivier2019-05-221-5/+7
| * | | | | | | | Also test the /password client routeBrendan Abolivier2019-05-211-1/+34
| * | | | | | | | First implementation of MSC2000Brendan Abolivier2019-05-201-0/+146
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'babolivier/account_validity_expiration_date' into dinsicBrendan Abolivier2019-05-211-0/+55
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Add startup background job for account validityBrendan Abolivier2019-05-171-0/+55
| |/ / / / / /
* | | | | | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-1724-223/+390
|\| | | | | |
| * | | | | | 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
| |/ / / / /
| * | | | | 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
| | |/ | |/|
* | | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-1466-1161/+1320
|\| |
| * | 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
| | |\
| * | | 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
* | | Fix failing testBrendan Abolivier2019-05-092-2/+5
* | | Incorporate reviewBrendan Abolivier2019-05-091-0/+2
* | | Fix testBrendan Abolivier2019-05-091-0/+7
* | | Incorporate reviewBrendan Abolivier2019-05-071-3/+3
* | | Bunch of testsBrendan Abolivier2019-04-301-2/+124
* | | TestsBrendan Abolivier2019-04-301-5/+36
* | | [DINSIC] Add ability to proxy identity lookups (#5048)Andrew Morgan2019-04-161-2/+0
* | | [DINSIC] Block internal users from inviting external users to a public room (...Andrew Morgan2019-04-161-0/+22
* | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-1522-329/+914
|\ \ \ | | |/ | |/|
| * | 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
| |\|
| | * Add account expiration featureBrendan 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 config option to block users from looking up 3PIDs (#5010) dinsic_2019-04-05Brendan Abolivier2019-04-052-1/+66
* | Merge branch 'master' of github.com:matrix-org/synapse into dinsicErik Johnston2019-04-0514-255/+459
|\|
| * 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