summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Support room version capabilities in CS API (MSC1804)Neil Johnson2019-01-251-0/+39
* | | | Follow redirects on .well-known (#4520)Richard van der Hoff2019-01-301-0/+97
* | | | Add a caching layer to .well-known responses (#4516)Richard van der Hoff2019-01-303-8/+243
* | | | Fix flake8 (#4519)Amber Brown2019-01-304-10/+1
| |/ / |/| |
* | | Relax requirement for a content-type on .well-known (#4511)Richard van der Hoff2019-01-291-1/+0
* | | Do not generate self-signed TLS certificates by default. (#4509)Amber Brown2019-01-292-2/+75
* | | Merge pull request #4481 from matrix-org/erikj/event_builderErik Johnston2019-01-292-31/+27
|\ \ \
| * | | Fix test to use valid event formatErik Johnston2019-01-291-1/+1
| * | | Make add_hashes_and_signatures operate on dictsErik Johnston2019-01-291-30/+26
* | | | Implement MSC1708 (.well-known lookups for server routing) (#4489)Richard van der Hoff2019-01-294-9/+350
* | | | Enable configuring test log level via env var (#4506)Richard van der Hoff2019-01-293-30/+79
|/ / /
* | | Use SimpleResolverComplexifier in tests (#4497)Richard van der Hoff2019-01-292-32/+16
* | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-282-3/+14
|\ \ \
| * | | Pass through room version to event authErik Johnston2019-01-252-3/+14
* | | | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-282-4/+7
* | | | Handle IP literals explicitlyRichard van der Hoff2019-01-281-17/+2
* | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-281-1/+180
|/ / /
* | | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-255-4/+14
|\ \ \
| * | | Fix testsErik Johnston2019-01-255-4/+14
* | | | Fix Host header sent by MatrixFederationAgent (#4468)Richard van der Hoff2019-01-252-1/+17
|/ / /
* | | Revert "Require event format version to parse or create events"Erik Johnston2019-01-255-14/+4
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo...Erik Johnston2019-01-245-14/+163
|\| |
| * | Look up the right SRV recordRichard van der Hoff2019-01-241-3/+9
| * | lots more tests for MatrixFederationAgentRichard van der Hoff2019-01-241-10/+79
| * | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-241-1/+3
| |\ \
| | * | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-1/+3
| | |/
| * | Use native UPSERTs where possible (#4306)Amber Brown2019-01-243-5/+20
| * | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-241-3/+60
* | | Fix testsErik Johnston2019-01-245-4/+14
|/ /
* | fix python2 test failureRichard van der Hoff2019-01-231-1/+1
* | Add a test for MatrixFederationAgentRichard van der Hoff2019-01-222-1/+195
* | put resolve_service in an objectRichard van der Hoff2019-01-221-20/+18
* | Require that service_name be a byte stringRichard van der Hoff2019-01-221-4/+4
* | Make MatrixFederationClient use MatrixFederationAgentRichard van der Hoff2019-01-221-0/+96
|/
* Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-222-14/+108
* Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-221-1/+0
* Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-181-7/+47
* Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-171-0/+104
* Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-111-154/+1
|\
| * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-101-154/+1
| |\
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-101-154/+1
| | |\
| | | * Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-101-148/+1
* | | | Fix adding new rows instead of updating them if one of the key values is a NU...Amber Brown2019-01-091-0/+71
|/ / /
* | | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-081-3/+10
* | | Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-292-145/+44
* | | Return well_known in /login response (#4319)Richard van der Hoff2018-12-241-0/+3
* | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5Richard van der Hoff2018-12-231-1/+23
|\ \ \
| * | | Fix test_metrics.py compatibility prometheus_client 0.5Maarten de Vries2018-12-211-1/+23
* | | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-222-98/+334
|/ / /
* | | create support user (#4141)Neil Johnson2018-12-148-10/+204
* | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-1/+1
* | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-071-0/+1
* | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-071-1/+30
* | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-061-15/+0
* | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-051-0/+58
|/ /
* | Patch defer.inlineCallbacks to check logcontexts in tests (#4205)Richard van der Hoff2018-12-043-3/+98
* | Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-1/+11
* | Check logcontexts before and after each test (#4190)Richard van der Hoff2018-11-272-8/+21
* | Fix more logcontext leaks in tests (#4209)Richard van der Hoff2018-11-271-1/+2
* | Do a GC after each test to fix logcontext leaks (#4227)Richard van der Hoff2018-11-271-2/+13
* | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixesRichard van der Hoff2018-11-204-5/+8
|\ \
| * | Fix logcontext leak in test_url_previewRichard van der Hoff2018-11-191-1/+2
| * | Fix logcontext leak in http pusher testRichard van der Hoff2018-11-191-1/+2
| * | Fix some tests which leaked logcontextsRichard van der Hoff2018-11-192-3/+4
* | | Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-0/+104
|/ /
* | Fix the terms UI auth testsTravis Ralston2018-11-151-1/+1
* | Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-152-0/+160
* | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-153-0/+44
* | Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-151-0/+77
* | Add a test for the public T&Cs formRichard van der Hoff2018-11-141-0/+7
* | Add test to assert set_e2e_device_keys correctly returns False on no-opErik Johnston2018-11-081-0/+15
* | Fix URL preview bugs (type error when loading cache from db, content-type inc...Amber Brown2018-11-082-0/+166
* | Remove some boilerplate in tests (#4156)Amber Brown2018-11-0710-216/+161
* | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-062-2/+5
* | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-42/+37
* | Tests for user consent resource (#4140)Amber Brown2018-11-063-5/+138
* | Add some tests for the HTTP pusher (#4149)Amber Brown2018-11-061-0/+159
* | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-061-1/+1
* | Merge pull request #4137 from matrix-org/erikj/clean_up_eventsErik Johnston2018-11-022-3/+3
|\ \
| * | Clean up event accesses and testsErik Johnston2018-11-022-3/+3
* | | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-032-1/+130
* | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_noneErik Johnston2018-11-021-2/+98
|\ \ \
| * | | Fix None exception in state res v2Erik Johnston2018-11-021-2/+98
| |/ /
* | | The tests also need a version parameter Travis Ralston2018-10-311-1/+1
* | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-3115-99/+716
|\| |
| * | Fix search 500ing (#4122)Amber Brown2018-10-311-1/+105
| * | Write some tests for the email pusher (#4095)Amber Brown2018-10-305-3/+160
| * | Merge pull request #4091 from matrix-org/rav/room_version_upgradesRichard van der Hoff2018-10-291-9/+1
| |\ \
| | * | fix broken testRichard van der Hoff2018-10-251-9/+1
| * | | Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-262-0/+160
| |/ /
| * | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-251-65/+110
| * | Merge pull request #4051 from matrix-org/erikj/alias_disallow_listErik Johnston2018-10-252-0/+115
| |\ \
| | * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-257-23/+734
| | |\ \
| | * | | Use allow/denyErik Johnston2018-10-252-5/+5
| | * | | Add tests for alias creation rulesErik Johnston2018-10-191-0/+48
| | * | | Add tests for config generationErik Johnston2018-10-191-0/+67
| * | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-251-2/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | fix style inconsistenciesNeil Johnson2018-10-241-2/+2
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-245-4/+677
| | |\ \ \
| | * | | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-231-2/+8
| | | |/ / | | |/| |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-257-4/+1113
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | improve auto room join logic, comments and testsNeil Johnson2018-10-121-4/+17
| * | | | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-047-205/+292
| |\ \ \ \
| * | | | | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-042-19/+44
* | | | | | pep8Travis Ralston2018-10-242-6/+3
* | | | | | It helps to import thingsTravis Ralston2018-10-241-0/+16
* | | | | | Move test to where the other integration tests areTravis Ralston2018-10-242-97/+109
* | | | | | Fix testTravis Ralston2018-10-241-25/+50
* | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-245-4/+677
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid...Richard van der Hoff2018-10-244-3/+666
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-242-3/+3
| | |\ \ \ \ \
| | | * | | | | Fix a number of flake8 errorsRichard van der Hoff2018-10-242-3/+3
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-242-0/+663
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | isortErik Johnston2018-10-241-4/+1
| | | * | | | Rename resolve_events_with_factoryErik Johnston2018-10-241-2/+2
| | | * | | | Add some state res v2 testsErik Johnston2018-10-162-0/+666
| * | | | | | Allow backslashes in event field filtersRichard van der Hoff2018-10-241-1/+11
| |/ / / / /
* | | | | | Fix terms UI auth testTravis Ralston2018-10-181-2/+5
* | | | | | Test for terms UI authTravis Ralston2018-10-181-0/+70
|/ / / / /
* / / / / Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-171-0/+39
|/ / / /
* | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-0938-985/+1879
|\ \ \ \ | | |/ / | |/| |
| * | | Add testsErik Johnston2018-10-021-0/+45
| * | | Disable frozen dicts by default (#3987)Amber Brown2018-10-022-2/+7
| * | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-106/+0
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-271-1/+1
| | |\| |
| | * | | Remove redundant, failing, testRichard van der Hoff2018-09-271-106/+0
| * | | | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-024-95/+238
| | |/ / | |/| |
| * | | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-271-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Replaced all occurences of e.message with str(e)Schnuffle2018-09-271-1/+1
| * | | Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-272-12/+21
| * | | docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-271-0/+39
| |/ /
| * | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_cachesRichard van der Hoff2018-09-251-1/+0
| |\ \
| | * | Fix some instances of ExpiringCache not expiring cache itemsErik Johnston2018-09-211-1/+0
| * | | Merge branch 'master' into developAmber Brown2018-09-251-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fix compatibility issue with older Twisted in tests.Oleg Girko2018-09-251-2/+2
| * | | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-204-42/+202
| * | | Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-202-3/+74
| * | | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-183-37/+122
| |/ /
| * | TestsErik Johnston2018-09-141-0/+81
| * | Attempt to figure out what's going on with timeouts (#3857)Amber Brown2018-09-142-1/+198
| * | improve namingNeil Johnson2018-09-121-3/+3
| * | expose number of real reserved usersNeil Johnson2018-09-121-0/+31
| * | Port tests/ to Python 3 (#3808)Amber Brown2018-09-0711-430/+348
| * | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6Neil Johnson2018-09-063-5/+48
| |\ \
| | * | ensure guests never enter mau listNeil Johnson2018-09-063-4/+7
| | * | guest users should not be part of mau totalNeil Johnson2018-09-051-2/+42
| * | | Merge branch 'master' into developRichard van der Hoff2018-09-062-14/+17
| |\ \ \ | | |/ / | |/| |
| | * | Fix origin handling for pushed transactionsRichard van der Hoff2018-09-052-14/+17
| * | | Fix tests on postgresql (#3740)Amber Brown2018-09-0416-337/+355
| * | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-311-0/+6
| * | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-311-0/+17
| * | | Port storage/ to Python 3 (#3725)Amber Brown2018-08-314-4/+129
| * | | Fix up testsRichard van der Hoff2018-08-283-6/+10
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-241-0/+1
| |\ \ \
| | * | | Fix checking if service notice room is already taggedErik Johnston2018-08-241-0/+1
| * | | | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-243-5/+5
| |/ / /
* | | | try to make flake8 and isort happyHubert Chathi2018-09-061-4/+5
* | | | update to newer Synapse APIsHubert Chathi2018-08-241-0/+1
* | | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-2489-2601/+3251
|\| | |
| * | | Unit testsErik Johnston2018-08-232-3/+227
| * | | Implement trail usersErik Johnston2018-08-231-0/+1
| * | | Fix bug where we resent "limit exceeded" server noticesErik Johnston2018-08-231-0/+66
| * | | Actually run the testsErik Johnston2018-08-231-0/+0
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-2219-127/+395
| |\ \ \
| | * \ \ Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-221-2/+2
| | |\ \ \
| | | * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-1782-2374/+2146
| | | |\ \ \
| | | * | | | Split ProfileHandler into master and workerErik Johnston2018-08-171-2/+2
| | * | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-226-6/+48
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-2085-2483/+2389
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | * | | | | Fix testsErik Johnston2018-08-096-5/+46
| | * | | | | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-221-11/+94
| | | |/ / / / | | |/| | | |
| | * | | | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-186-50/+204
| | * | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-177-60/+49
| | |\ \ \ \ \
| | | * | | | | Fix the testsAmber Brown2018-08-157-60/+49
| * | | | | | | Update notice formatErik Johnston2018-08-221-3/+9
| * | | | | | | rename error codeNeil Johnson2018-08-182-4/+4
| * | | | | | | special case server_notices_mxidNeil Johnson2018-08-181-0/+8
| * | | | | | | clean up, no functional changesNeil Johnson2018-08-171-15/+17
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-175-18/+19
| |\| | | | | |
| | * | | | | | Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-171-0/+13
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | add new error type ResourceLimitNeil Johnson2018-08-165-18/+19
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-171-0/+13
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | call reap on start up and fix under reaping bugNeil Johnson2018-08-161-0/+13
| | |/ / / / /
| * | | | | | refactor for readability, and reuse caching for setting tagsNeil Johnson2018-08-161-0/+1
| * | | | | | check for room state before deciding on actionNeil Johnson2018-08-161-20/+32
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-153-3/+57
| |\| | | | |
| | * | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-152-2/+56
| | |\ \ \ \ \
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-153-7/+7
| | | |\| | | |
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-142-2/+2
| | | |\ \ \ \ \
| | | * | | | | | fix off by 1 errorsNeil Johnson2018-08-142-3/+14
| | | * | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-141-4/+4
| | | * | | | | | fix off by 1s on mauNeil Johnson2018-08-142-5/+48
| | | * | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-143-5/+10
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...Neil Johnson2018-08-143-12/+84
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-151-1/+1
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-1582-2362/+1984
| |\| | | | | | | |
| | * | | | | | | | update error codesNeil Johnson2018-08-151-2/+2
| | * | | | | | | | update error codes for resource limitingNeil Johnson2018-08-151-2/+2
| | * | | | | | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-152-3/+3
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-145-50/+258
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | / / / / | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | fix setup_test_homeserver to be postgres compatibleNeil Johnson2018-08-141-1/+1
| | | * | | | | | in case max_mau is less than I thinkNeil Johnson2018-08-141-1/+1
| | | * | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-143-12/+84
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| / / / / | | | | |/ / / /
| | | * | | | | Implement a new test baseclass to cut down on boilerplate (#3684)Amber Brown2018-08-142-37/+173
| | * | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-133-5/+10
| | |/ / / / /
| | * | | | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-133-10/+5
| | * | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-133-5/+10
| | * | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-1344-58/+187
| | * | | | | fix up a forced long lineAmber Brown2018-08-111-1/+2
| | * | | | | Run black.black2018-08-1075-2280/+1629
| | * | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-103-3/+3
| | * | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-101-0/+2
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-2723-1161/+2080
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_...Jeroen2018-07-1476-218/+279
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-0910-6/+731
| | | |\ \ \ \ \ \
| | | * | | | | | | send SNI for federation requestsJeroen2018-06-241-0/+2
| * | | | | | | | | implementation of server notices to alert on hitting resource limitsNeil Johnson2018-08-101-0/+125
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | rename _user_last_seen_monthly_activeNeil Johnson2018-08-092-12/+13
| * | | | | | | | fix importsNeil Johnson2018-08-091-1/+1
| * | | | | | | | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-091-9/+31
| * | | | | | | | block sync if auth checks failNeil Johnson2018-08-091-6/+13
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-092-1/+12
| |\| | | | | | |
| | * | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-092-1/+12
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-081-0/+4
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-082-1/+60
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | disable HS from configNeil Johnson2018-08-042-1/+12
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-0913-52/+74
| |\| | | | | | | | |
| | * | | | | | | | | Test fixes for Python 3 (#3647)Amber Brown2018-08-0913-52/+70
| | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-081-0/+4
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Basic support for room versioningRichard van der Hoff2018-08-031-0/+4
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | / | | | | | sync auth blockingNeil Johnson2018-08-081-0/+42
| |/ / / / / / /
| * | | | | | | mock config.max_mau_valueNeil Johnson2018-08-081-0/+1
| * | | | | | | implement reserved users for mau limitsNeil Johnson2018-08-071-1/+58
| * | | | | | | add default mau_limits_reserved_threepidsNeil Johnson2018-08-061-0/+1
| | |/ / / / / | |/| | | | |
| * | | | | | remove unused importNeil Johnson2018-08-031-1/+1
| * | | | | | bug fixesNeil Johnson2018-08-032-8/+3
| * | | | | | wip commit - tests failingNeil Johnson2018-08-032-13/+13
| * | | | | | fix (lots of) py3 test failuresNeil Johnson2018-08-032-1/+1
| * | | | | | fix py3 test failureNeil Johnson2018-08-031-0/+1
| * | | | | | fix caching and testsNeil Johnson2018-08-031-13/+37
| * | | | | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-023-42/+68
| * | | | | | remove unused count_monthly_usersNeil Johnson2018-08-021-65/+0
| * | | | | | fix test, update constructor callNeil Johnson2018-08-021-1/+1
| * | | | | | insertion into monthly_active_usersNeil Johnson2018-08-021-3/+63
| * | | | | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-021-3/+3
| * | | | | | change monthly_active_users table to be a single columnNeil Johnson2018-08-011-3/+3
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-017-32/+310
| |\| | | | |
| * | | | | | api into monthly_active_users tableNeil Johnson2018-07-311-0/+42
| | |_|_|_|/ | |/| | | |
* | | | | | 404 nicely if you try to interact with a missing current versionMatthew Hodgson2018-08-121-0/+22
* | | | | | flake8Matthew Hodgson2018-08-121-8/+13