| Commit message (Expand) | Author | Age | Files | Lines |
* | Port tests/ to Python 3 (#3808) | Amber Brown | 2018-09-07 | 11 | -430/+348 |
* | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 3 | -5/+48 |
|\ |
|
| * | ensure guests never enter mau list | Neil Johnson | 2018-09-06 | 3 | -4/+7 |
| * | guest users should not be part of mau total | Neil Johnson | 2018-09-05 | 1 | -2/+42 |
* | | Merge branch 'master' into develop | Richard van der Hoff | 2018-09-06 | 2 | -14/+17 |
|\ \
| |/
|/| |
|
| * | Fix origin handling for pushed transactions | Richard van der Hoff | 2018-09-05 | 2 | -14/+17 |
* | | Fix tests on postgresql (#3740) | Amber Brown | 2018-09-04 | 16 | -337/+355 |
* | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 1 | -0/+6 |
* | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -0/+17 |
* | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 4 | -4/+129 |
* | | Fix up tests | Richard van der Hoff | 2018-08-28 | 3 | -6/+10 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
|\ \ |
|
| * | | Fix checking if service notice room is already tagged | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
* | | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 3 | -5/+5 |
|/ / |
|
* | | Unit tests | Erik Johnston | 2018-08-23 | 2 | -3/+227 |
* | | Implement trail users | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
* | | Fix bug where we resent "limit exceeded" server notices | Erik Johnston | 2018-08-23 | 1 | -0/+66 |
* | | Actually run the tests | Erik Johnston | 2018-08-23 | 1 | -0/+0 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Erik Johnston | 2018-08-22 | 19 | -127/+395 |
|\ \ |
|
| * \ | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 1 | -2/+2 |
| |\ \ |
|
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-17 | 82 | -2374/+2146 |
| | |\ \ |
|
| | * | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 1 | -2/+2 |
| * | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 6 | -6/+48 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2018-08-20 | 85 | -2483/+2389 |
| | |\ \ \ \
| | | | |_|/
| | | |/| | |
|
| | * | | | | Fix tests | Erik Johnston | 2018-08-09 | 6 | -5/+46 |
| * | | | | | Split the state_group_cache in two (#3726) | Matthew Hodgson | 2018-08-22 | 1 | -11/+94 |
| | |/ / /
| |/| | | |
|
| * | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 6 | -50/+204 |
| * | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 7 | -60/+49 |
| |\ \ \ \ |
|
| | * | | | | Fix the tests | Amber Brown | 2018-08-15 | 7 | -60/+49 |
* | | | | | | Update notice format | Erik Johnston | 2018-08-22 | 1 | -3/+9 |
* | | | | | | rename error code | Neil Johnson | 2018-08-18 | 2 | -4/+4 |
* | | | | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+8 |
* | | | | | | clean up, no functional changes | Neil Johnson | 2018-08-17 | 1 | -15/+17 |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 5 | -18/+19 |
|\| | | | | |
|
| * | | | | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 1 | -0/+13 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| * | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 5 | -18/+19 |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 1 | -0/+13 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -0/+13 |
| |/ / / / |
|
* | | | | | refactor for readability, and reuse caching for setting tags | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
* | | | | | check for room state before deciding on action | Neil Johnson | 2018-08-16 | 1 | -20/+32 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-15 | 3 | -3/+57 |
|\| | | | |
|
| * | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 2 | -2/+56 |
| |\ \ \ \ |
|
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... | Neil Johnson | 2018-08-15 | 3 | -7/+7 |
| | |\| | | |
|
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... | Neil Johnson | 2018-08-14 | 2 | -2/+2 |
| | |\ \ \ \ |
|
| | * | | | | | fix off by 1 errors | Neil Johnson | 2018-08-14 | 2 | -3/+14 |
| | * | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-14 | 1 | -4/+4 |
| | * | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 2 | -5/+48 |
| | * | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 3 | -5/+10 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei... | Neil Johnson | 2018-08-14 | 3 | -12/+84 |
| | |\ \ \ \ \ \ |
|
| * | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -1/+1 |
| | |_|_|_|/ / /
| |/| | | | | | |
|
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-15 | 82 | -2362/+1984 |
|\| | | | | | | |
|
| * | | | | | | | update error codes | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| * | | | | | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| * | | | | | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 2 | -3/+3 |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 5 | -50/+258 |
| |\ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | / / /
| | | |_|/ / /
| | |/| | | | |
|
| | * | | | | | fix setup_test_homeserver to be postgres compatible | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | * | | | | | in case max_mau is less than I think | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | * | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 3 | -12/+84 |
| | |\ \ \ \ \
| | | |/ / / /
| | |/| / / /
| | | |/ / / |
|
| | * | | | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 2 | -37/+173 |
| * | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 3 | -5/+10 |
| |/ / / / |
|
| * | | | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 3 | -10/+5 |
| * | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 3 | -5/+10 |
| * | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 44 | -58/+187 |
| * | | | | fix up a forced long line | Amber Brown | 2018-08-11 | 1 | -1/+2 |
| * | | | | Run black. | black | 2018-08-10 | 75 | -2280/+1629 |
| * | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 3 | -3/+3 |
| * | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 1 | -0/+2 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 23 | -1161/+2080 |
| | |\ \ \ |
|
| | * \ \ \ | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... | Jeroen | 2018-07-14 | 76 | -218/+279 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 10 | -6/+731 |
| | |\ \ \ \ \ |
|
| | * | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 1 | -0/+2 |
* | | | | | | | | implementation of server notices to alert on hitting resource limits | Neil Johnson | 2018-08-10 | 1 | -0/+125 |
| |_|_|_|_|/ /
|/| | | | | | |
|
* | | | | | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 2 | -12/+13 |
* | | | | | | | fix imports | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
* | | | | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -9/+31 |
* | | | | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -6/+13 |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 2 | -1/+12 |
|\| | | | | | |
|
| * | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 2 | -1/+12 |
| |\ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| | * | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+4 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 2 | -1/+60 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 2 | -1/+12 |
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 13 | -52/+74 |
|\| | | | | | | | |
|
| * | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 13 | -52/+70 |
| | |_|/ / / / /
| |/| | | | | | |
|
| * | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 1 | -0/+4 |
| |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| | * | | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 1 | -0/+4 |
* | | | | | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 1 | -0/+42 |
|/ / / / / / / |
|
* | | | | | | | mock config.max_mau_value | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
* | | | | | | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 1 | -1/+58 |
* | | | | | | | add default mau_limits_reserved_threepids | Neil Johnson | 2018-08-06 | 1 | -0/+1 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | remove unused import | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
* | | | | | | bug fixes | Neil Johnson | 2018-08-03 | 2 | -8/+3 |
* | | | | | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 2 | -13/+13 |
* | | | | | | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 2 | -1/+1 |
* | | | | | | fix py3 test failure | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
* | | | | | | fix caching and tests | Neil Johnson | 2018-08-03 | 1 | -13/+37 |
* | | | | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 3 | -42/+68 |
* | | | | | | remove unused count_monthly_users | Neil Johnson | 2018-08-02 | 1 | -65/+0 |
* | | | | | | fix test, update constructor call | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
* | | | | | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -3/+63 |
* | | | | | | Revert "change monthly_active_users table to be a single column" | Neil Johnson | 2018-08-02 | 1 | -3/+3 |
* | | | | | | change monthly_active_users table to be a single column | Neil Johnson | 2018-08-01 | 1 | -3/+3 |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-01 | 7 | -32/+310 |
|\| | | | | |
|
| * | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 3 | -12/+184 |
| |\ \ \ \ \ |
|
| | * | | | | | fix isort | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | * | | | | | fix test for py3 | Neil Johnson | 2018-08-01 | 1 | -0/+4 |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i... | Neil Johnson | 2018-08-01 | 2 | -1/+101 |
| | |\ \ \ \ \ |
|
| | * | | | | | | fix known broken test | Neil Johnson | 2018-08-01 | 1 | -25/+20 |
| | * | | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 2 | -21/+28 |
| | * | | | | | | coding style | Neil Johnson | 2018-07-31 | 2 | -3/+2 |
| | * | | | | | | fix user_ips counting | Neil Johnson | 2018-07-31 | 1 | -9/+33 |
| | * | | | | | | monthly_active_tests | Neil Johnson | 2018-07-30 | 1 | -0/+48 |
| | * | | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 2 | -1/+97 |
| | | |_|_|_|/
| | |/| | | | |
|
| * | | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -19/+25 |
| | |/ / / /
| |/| | | | |
|
| * | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decorator | Richard van der Hoff | 2018-08-01 | 1 | -0/+101 |
| |\ \ \ \ \ |
|
| | * | | | | | fix invalidation | Richard van der Hoff | 2018-07-27 | 1 | -1/+41 |
| | * | | | | | Rewrite cache list decorator | Richard van der Hoff | 2018-07-27 | 1 | -0/+61 |
| | |/ / / / |
|
| * / / / / | Remove pdu_failures from transactions | Travis Ralston | 2018-07-30 | 1 | -1/+0 |
| |/ / / / |
|
* / / / / | api into monthly_active_users table | Neil Johnson | 2018-07-31 | 1 | -0/+42 |
|/ / / / |
|
* | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 1 | -7/+30 |
|\ \ \ \ |
|
| * | | | | Fix unit tests | Richard van der Hoff | 2018-07-25 | 1 | -7/+30 |
* | | | | | flake8 | Matthew Hodgson | 2018-07-25 | 1 | -12/+12 |
* | | | | | add tests for _get_some_state_from_cache | Matthew Hodgson | 2018-07-25 | 1 | -0/+150 |
* | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 1 | -0/+9 |
* | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 7 | -87/+427 |
|\| | | | |
|
| * | | | | Fix unit tests | Erik Johnston | 2018-07-23 | 2 | -15/+40 |
| * | | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 1 | -2/+1 |
| * | | | | Test and fix support for cancellation in Linearizer | Richard van der Hoff | 2018-07-20 | 1 | -0/+31 |
| * | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixes | Richard van der Hoff | 2018-07-20 | 2 | -70/+47 |
| |\ \ \ \ |
|
| | * | | | | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 2 | -70/+47 |
| | * | | | | Add a sleep to the Limiter to fix stack overflows. | Richard van der Hoff | 2018-07-20 | 1 | -4/+4 |
| * | | | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 2 | -0/+308 |
| |/ / / / |
|
* | | | | | make test work | Matthew Hodgson | 2018-07-19 | 1 | -37/+46 |
* | | | | | first cut of a UT for testing state store (untested) | Matthew Hodgson | 2018-07-19 | 1 | -0/+151 |
|/ / / / |
|
* | | | | Merge pull request #3556 from matrix-org/rav/background_processes | Richard van der Hoff | 2018-07-19 | 1 | -52/+4 |
|\ \ \ \ |
|
| * | | | | Make Distributor run its processes as a background process | Richard van der Hoff | 2018-07-18 | 1 | -52/+4 |
* | | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 5 | -86/+27 |
|/ / / / |
|
* | | | | Fix visibility of events from erased users over federation | Richard van der Hoff | 2018-07-17 | 1 | -0/+63 |
* | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 1 | -0/+261 |
|\ \ \ \ |
|
| * | | | | fix imports | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| * | | | | Add a test which profiles filter_events_for_server in a large room | Richard van der Hoff | 2018-07-16 | 1 | -2/+155 |
| * | | | | Move filter_events_for_server out of FederationHandler | Richard van der Hoff | 2018-07-16 | 1 | -0/+107 |
* | | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 10 | -931/+935 |
* | | | | | Add unit test | Erik Johnston | 2018-07-17 | 1 | -0/+16 |
* | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cache | Amber Brown | 2018-07-17 | 1 | -3/+3 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Fixup unit test | Erik Johnston | 2018-07-13 | 1 | -3/+3 |
| |/ / / |
|
* | | | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 1 | -1/+4 |
* | | | | Fix unit tests | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
|/ / / |
|
* | | | Use more portable syntax using attrs package. | Oleg Girko | 2018-07-10 | 1 | -1/+1 |
* | | | run isort | Amber Brown | 2018-07-09 | 76 | -216/+273 |
| |/
|/| |
|
* | | Merge remote-tracking branch 'hera/rav/server_acls' into develop | Neil Johnson | 2018-07-05 | 2 | -0/+57 |
|\ \ |
|
| * | | Implementation of server_acls | Richard van der Hoff | 2018-07-04 | 2 | -0/+57 |
* | | | Merge pull request #3483 from matrix-org/rav/more_server_name_validation | Erik Johnston | 2018-07-05 | 1 | -4/+13 |
|\| | |
|
| * | | More server_name validation | Richard van der Hoff | 2018-07-04 | 1 | -4/+13 |
* | | | Reinstate lost run_on_reactor in unit test | Richard van der Hoff | 2018-07-04 | 1 | -2/+15 |
|/ / |
|
* | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 2 | -0/+46 |
* | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 2 | -1/+247 |
|\ \ |
|
| * | | pep8 | Amber Brown | 2018-06-27 | 1 | -5/+2 |
| * | | cleanups | Amber Brown | 2018-06-27 | 1 | -1/+4 |
| * | | stylistic cleanup | Amber Brown | 2018-06-27 | 1 | -6/+18 |
| * | | cleanups | Amber Brown | 2018-06-27 | 1 | -7/+6 |
| * | | handle federation not telling us about prev_events | Amber Brown | 2018-06-27 | 2 | -1/+236 |
* | | | add test | Matthew Hodgson | 2018-06-28 | 1 | -0/+33 |
* | | | fix tests | Matthew Hodgson | 2018-06-28 | 1 | -3/+15 |
|/ / |
|
* / | Better testing framework for homeserver-using things (#3446) | Amber Brown | 2018-06-27 | 2 | -0/+309 |
|/ |
|
* | Merge pull request #3427 from matrix-org/erikj/remove_filters | Erik Johnston | 2018-06-22 | 1 | -8/+0 |
|\ |
|
| * | remove dead filter_events_for_clients | Richard van der Hoff | 2018-06-12 | 1 | -8/+0 |
* | | Disable partial state group caching for wildcard lookups | Richard van der Hoff | 2018-06-22 | 1 | -6/+6 |
* | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 7 | -21/+30 |
* | | Merge branch 'master' into develop | Richard van der Hoff | 2018-06-14 | 2 | -2/+165 |
|\ \ |
|
| * | | Fix broken unit test | Richard van der Hoff | 2018-06-14 | 1 | -2/+14 |
| * | | remove spurious debug | Richard van der Hoff | 2018-06-14 | 1 | -2/+0 |
| * | | Make default state_default 50 | Richard van der Hoff | 2018-06-14 | 1 | -0/+153 |
* | | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 2 | -4/+0 |
| |/
|/| |
|
* | | Port to sortedcontainers (with tests!) (#3332) | Amber Brown | 2018-06-06 | 1 | -0/+198 |
|/ |
|
* | Put python's logs into Trial when running unit tests (#3319) | Amber Brown | 2018-06-04 | 1 | -13/+27 |
* | fix tests | Richard van der Hoff | 2018-05-29 | 1 | -0/+1 |
* | fix another dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -2/+2 |
* | fix dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -4/+4 |
* | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 4 | -5/+87 |
|\ |
|
| * | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| * | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
| * | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 2 | -3/+9 |
| * | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 1 | -0/+21 |
| * | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 1 | -0/+54 |
| * | Use stream rather depth ordering for push actions | Erik Johnston | 2018-05-11 | 1 | -2/+2 |
* | | rest of the changes | Amber Brown | 2018-05-21 | 2 | -192/+0 |
* | | replacing portions | Amber Brown | 2018-05-21 | 1 | -0/+3 |
|/ |
|
* | Merge pull request #3161 from NotAFile/remove-v1auth | Richard van der Hoff | 2018-05-03 | 4 | -13/+18 |
|\ |
|
| * | Burminate v1auth | Adrian Tschira | 2018-04-30 | 4 | -13/+18 |
* | | Merge pull request #3175 from matrix-org/erikj/escape_metric_values | Erik Johnston | 2018-05-03 | 1 | -1/+20 |
|\ \ |
|
| * | | Escape label values in prometheus metrics | Erik Johnston | 2018-05-02 | 1 | -1/+20 |
* | | | Merge branch 'develop' into rav/more_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 3 | -3/+47 |
|\ \ \ |
|
| * | | | Fix a couple of logcontext leaks in unit tests | Richard van der Hoff | 2018-05-02 | 2 | -3/+9 |
| |/ / |
|
| * / | Fix incorrect reference to StringIO | Richard van der Hoff | 2018-05-02 | 1 | -0/+38 |
| |/ |
|
* | | Remove spurious unittest.DEBUG | Richard van der Hoff | 2018-05-02 | 1 | -1/+0 |
* | | Fix a class of logcontext leaks | Richard van der Hoff | 2018-05-02 | 1 | -11/+56 |
|/ |
|
* | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 2 | -10/+9 |
|\ |
|
| * | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 2 | -10/+9 |
* | | Merge branch 'develop' into rav/deferred_timeout | Richard van der Hoff | 2018-04-27 | 5 | -5/+6 |
|\ \ |
|
| * \ | Merge pull request #3109 from NotAFile/py3-tests-fix | Richard van der Hoff | 2018-04-23 | 5 | -5/+6 |
| |\ \ |
|
| | * | | Make tests py3 compatible | Adrian Tschira | 2018-04-16 | 5 | -5/+6 |
| | |/ |
|
* | / | Use deferred.addTimeout instead of time_bound_deferred | Richard van der Hoff | 2018-04-23 | 1 | -33/+0 |
|/ / |
|
* | | Merge pull request #3104 from NotAFile/py3-unittest-config | Richard van der Hoff | 2018-04-20 | 1 | -0/+4 |
|\ \ |
|
| * | | Add some more variables to the unittest config | Adrian Tschira | 2018-04-15 | 1 | -0/+4 |
| |/ |
|
* | | Merge pull request #3103 from NotAFile/py3-baseexcepton-message | Richard van der Hoff | 2018-04-20 | 1 | -6/+6 |
|\ \ |
|
| * | | Use str(e) instead of e.message | Adrian Tschira | 2018-04-15 | 1 | -6/+6 |
| |/ |
|
* / | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 1 | -0/+68 |
|/ |
|
* | Fix tests | Erik Johnston | 2018-04-11 | 1 | -0/+1 |
* | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 1 | -0/+1 |
|\ |
|
| * | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 1 | -0/+1 |
* | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 1 | -1/+1 |
|\ \ |
|
| * | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -1/+1 |
| |/ |
|
* | | Merge pull request #3016 from silkeh/improve-service-lookups | Richard van der Hoff | 2018-04-09 | 1 | -27/+2 |
|\ \ |
|
| * | | Remove address resolution of hosts in SRV records | Silke | 2018-04-04 | 1 | -27/+2 |
| |/ |
|
* / | Fix overzealous cache invalidation | Richard van der Hoff | 2018-04-05 | 1 | -0/+46 |
|/ |
|
* | s/replication_client/federation_client/ | Erik Johnston | 2018-03-13 | 9 | -20/+20 |
* | s/replication_server/federation_server | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
* | Fix tests | Erik Johnston | 2018-03-13 | 10 | -21/+22 |
* | Fix tests | Erik Johnston | 2018-03-13 | 2 | -10/+8 |
* | Fix comment typo | Richard van der Hoff | 2018-03-05 | 1 | -1/+1 |
* | Test and fix find_first_stream_ordering_after_ts | Richard van der Hoff | 2018-03-05 | 1 | -0/+67 |
* | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 1 | -1/+1 |
* | Merge pull request #2892 from matrix-org/erikj/batch_inserts_push_actions | Erik Johnston | 2018-02-26 | 2 | -5/+7 |
|\ |
|
| * | Fix unit tests | Erik Johnston | 2018-02-20 | 2 | -5/+7 |
* | | Fix test | Erik Johnston | 2018-02-20 | 1 | -1/+1 |
|/ |
|
* | Fix unit test | Erik Johnston | 2018-02-15 | 1 | -4/+6 |
* | Remove context.push_actions | Erik Johnston | 2018-02-15 | 1 | -1/+4 |
* | Merge pull request #2847 from matrix-org/erikj/separate_event_creation | Erik Johnston | 2018-02-06 | 2 | -8/+6 |
|\ |
|
| * | s/_create_new_client_event/create_new_client_event/ | Erik Johnston | 2018-02-06 | 2 | -4/+4 |
| * | Updates tests | Erik Johnston | 2018-02-05 | 2 | -8/+6 |
* | | Store state groups separately from events (#2784) | Erik Johnston | 2018-02-06 | 2 | -69/+89 |
* | | Merge pull request #2844 from matrix-org/rav/evicted_metrics | Richard van der Hoff | 2018-02-05 | 1 | -0/+12 |
|\ \
| |/
|/| |
|
| * | report metrics on number of cache evictions | Richard van der Hoff | 2018-02-05 | 1 | -0/+12 |
* | | Fix broken unit test for media storage | Erik Johnston | 2018-02-05 | 1 | -1/+6 |
* | | Merge pull request #2791 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-02-05 | 3 | -0/+109 |
|\ \ |
|
| * | | Add unit tests | Erik Johnston | 2018-01-18 | 3 | -0/+109 |
* | | | Factor out resolve_state_groups to a separate handler | Richard van der Hoff | 2018-02-01 | 1 | -1/+3 |
| |/
|/| |
|
* | | Add tests for user directory search | Richard van der Hoff | 2018-01-27 | 2 | -0/+89 |
* | | Make it possible to run tests against postgres | Richard van der Hoff | 2018-01-27 | 1 | -9/+34 |
* | | Create dbpool as normal in tests | Richard van der Hoff | 2018-01-27 | 2 | -45/+19 |
* | | Run on_new_connection for unit tests | Richard van der Hoff | 2018-01-27 | 1 | -7/+17 |
* | | Remove unused/bitrotted MemoryDataStore | Richard van der Hoff | 2018-01-26 | 1 | -151/+13 |
* | | Remove spurious unittest.DEBUG | Richard van der Hoff | 2018-01-26 | 1 | -1/+0 |
* | | Merge pull request #2821 from matrix-org/rav/matthew_test_fixes | Richard van der Hoff | 2018-01-22 | 1 | -2/+6 |
|\ \ |
|
| * | | Matthew's fixes to the unit tests | Richard van der Hoff | 2018-01-22 | 1 | -2/+6 |
* | | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 1 | -0/+1 |
|/ / |
|
* | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid | Matthew Hodgson | 2018-01-22 | 1 | -0/+1 |
|\ \ |
|
| * | | mock registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 1 | -0/+1 |
* | | | Merge pull request #2804 from matrix-org/erikj/file_consumer | Erik Johnston | 2018-01-18 | 1 | -0/+176 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Move test stuff to tests | Erik Johnston | 2018-01-18 | 1 | -8/+46 |