summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-11-204-5/+8
|\
| * 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
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-11-208-1/+386
|\| |
| * | 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
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-11-142-0/+22
|\|
| * 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
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2018-11-0811-216/+327
|\|
| * 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
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2018-11-0611-54/+692
|\|
| * 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
| |\|
| * | 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
| |\ \
| * | | Fix terms UI auth testTravis Ralston2018-10-181-2/+5
| * | | Test for terms UI authTravis Ralston2018-10-181-0/+70
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesAmber Brown2018-10-316-4/+265
|\ \ \ \ | | |_|/ | |/| |
| * | | 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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-10-291-9/+1
|\| | |
| * | | 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
* | | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesAmber Brown2018-10-292-0/+160
|\| | | |
| * | | | Port register_new_matrix_user to Python 3 and add tests (#4085)Amber Brown2018-10-262-0/+160
| |/ / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-10-2611-90/+967
|\| | |
| * | | 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
| |\ \ \ | | | |/ | | |/|
| | * | 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
| | |/ /
| * | | 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
* | | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-10-182-0/+436
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | 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
| |\ \ \ | | | |/ | | |/|
| * | | 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
| |\ \ \
| * | | | 404 nicely if you try to interact with a missing current versionMatthew Hodgson2018-08-121-0/+22
| * | | | flake8Matthew Hodgson2018-08-121-8/+13
| * | | | implement remaining tests and make them workMatthew Hodgson2018-08-121-25/+251
| * | | | lintingMatthew Hodgson2018-08-121-25/+23
| * | | | fix idiocies and so make tests passMatthew Hodgson2018-08-121-8/+11
| * | | | first cut at a UTMatthew Hodgson2018-08-121-0/+141
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-10-021-0/+45
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Add testsErik Johnston2018-10-021-0/+45
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-10-028-204/+294
|\| | | |
| * | | | 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 branch 'develop' into matrix-org-hotfixesMatthew Hodgson2018-09-262-3/+2
|\| | |
| * | | 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
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesMichael Kaye2018-09-244-42/+202
|\| | | |
| * | | | Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-204-42/+202
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-09-205-40/+196
|\| | | |
| * | | | 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
| |/ / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-09-141-0/+81
|\| | |
| * | | TestsErik Johnston2018-09-141-0/+81
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-09-133-1/+229
|\| | |
| * | | 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
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-09-1133-761/+1341
|\| | |
| * | | 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
| |/ / /
| * | | 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
| |\ \ \
| * | | | 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' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-171-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 branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-1582-2362/+1984
| |\ \ \ \ \ \ \
| * | | | | | | | implementation of server notices to alert on hitting resource limitsNeil Johnson2018-08-101-0/+125
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-08-228-19/+144
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | 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
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-08-2017-126/+283
|\| | | | | | | | |
| * | | | | | | | | 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
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-171-0/+13
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | call reap on start up and fix under reaping bugNeil Johnson2018-08-161-0/+13
| | | |_|_|_|/ / | | |/| | | | |
| * / | | | | | add new error type ResourceLimitNeil Johnson2018-08-165-18/+19
| |/ / / / / /
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-08-163-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 matrix-org-hotfixesErik Johnston2018-08-1583-2485/+2354
|\| | | | | | | |
| * | | | | | | | 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
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
| | | * | | | 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 branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-0913-52/+74
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | sync auth blockingNeil Johnson2018-08-081-0/+42
| | * | | | | 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
| * | | | | | | | 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
| * | | | | | | | | 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
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-08-069-39/+659
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-013-12/+184
| |\ \ \ \ \
| | * | | | | fix isortNeil Johnson2018-08-011-1/+0
| | * | | | | fix test for py3Neil Johnson2018-08-011-0/+4
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-012-1/+101
| | |\ \ \ \ \
| | * | | | | | fix known broken testNeil Johnson2018-08-011-25/+20
| | * | | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-012-21/+28
| | * | | | | | coding styleNeil Johnson2018-07-312-3/+2
| | * | | | | | fix user_ips countingNeil Johnson2018-07-311-9/+33
| | * | | | | | monthly_active_testsNeil Johnson2018-07-301-0/+48
| | * | | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-302-1/+97
| | | |/ / / / | | |/| | | |
| * | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-022-19/+25
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decoratorRichard van der Hoff2018-08-011-0/+101
| |\ \ \ \ \
| | * | | | | fix invalidationRichard van der Hoff2018-07-271-1/+41
| | * | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-271-0/+61
| | |/ / / /
| * / / / / Remove pdu_failures from transactionsTravis Ralston2018-07-301-1/+0
| |/ / / /
| * | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-251-7/+30
| |\ \ \ \
| | * | | | Fix unit testsRichard van der Hoff2018-07-251-7/+30
| * | | | | flake8Matthew Hodgson2018-07-251-12/+12
| * | | | | add tests for _get_some_state_from_cacheMatthew Hodgson2018-07-251-0/+150
| * | | | | incorporate more reviewMatthew Hodgson2018-07-241-0/+9
| * | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-237-87/+427
| |\| | | |
| * | | | | make test workMatthew Hodgson2018-07-191-37/+46
| * | | | | first cut of a UT for testing state store (untested)Matthew Hodgson2018-07-191-0/+151
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-07-237-87/+427
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix unit testsErik Johnston2018-07-232-15/+40
| * | | | | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-211-2/+1
| * | | | | Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-201-0/+31
| * | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixesRichard van der Hoff2018-07-202-70/+47
| |\ \ \ \ \
| | * | | | | Combine Limiter and LinearizerRichard van der Hoff2018-07-202-70/+47
| | * | | | | Add a sleep to the Limiter to fix stack overflows.Richard van der Hoff2018-07-201-4/+4
| | |/ / / /
| * / / / / Admin API for creating new users (#3415)Amber Brown2018-07-202-0/+308
| |/ / / /
* | | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-07-196-138/+31
|\| | | |
| * | | | Merge pull request #3556 from matrix-org/rav/background_processesRichard van der Hoff2018-07-191-52/+4
| |\ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-02-09 03:51:08 +0000