| Commit message (Expand) | Author | Age | Files | Lines |
* | Update federation routing logic to check .well-known before SRV | Richard van der Hoff | 2019-01-31 | 1 | -30/+21 |
* | Merge pull request #4472 from matrix-org/neilj/room_capabilities | Erik Johnston | 2019-01-30 | 1 | -0/+78 |
|\ |
|
| * | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 20 | -120/+766 |
| |\ |
|
| * | | rework format of change password capability | Neil Johnson | 2019-01-29 | 1 | -2/+2 |
| * | | support change_password in capabilities end-point | Neil Johnson | 2019-01-29 | 1 | -0/+23 |
| * | | isort | Neil Johnson | 2019-01-29 | 1 | -1/+2 |
| * | | enforce auth for capabilities endpoint | Neil Johnson | 2019-01-29 | 1 | -4/+19 |
| * | | Support room version capabilities in CS API (MSC1804) | Neil Johnson | 2019-01-25 | 1 | -0/+39 |
* | | | Follow redirects on .well-known (#4520) | Richard van der Hoff | 2019-01-30 | 1 | -0/+97 |
* | | | Add a caching layer to .well-known responses (#4516) | Richard van der Hoff | 2019-01-30 | 3 | -8/+243 |
* | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 4 | -10/+1 |
| |/
|/| |
|
* | | Relax requirement for a content-type on .well-known (#4511) | Richard van der Hoff | 2019-01-29 | 1 | -1/+0 |
* | | Do not generate self-signed TLS certificates by default. (#4509) | Amber Brown | 2019-01-29 | 2 | -2/+75 |
* | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 2 | -31/+27 |
|\ \ |
|
| * | | Fix test to use valid event format | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| * | | Make add_hashes_and_signatures operate on dicts | Erik Johnston | 2019-01-29 | 1 | -30/+26 |
* | | | Implement MSC1708 (.well-known lookups for server routing) (#4489) | Richard van der Hoff | 2019-01-29 | 4 | -9/+350 |
* | | | Enable configuring test log level via env var (#4506) | Richard van der Hoff | 2019-01-29 | 3 | -30/+79 |
|/ / |
|
* | | Use SimpleResolverComplexifier in tests (#4497) | Richard van der Hoff | 2019-01-29 | 2 | -32/+16 |
* | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 2 | -3/+14 |
|\ \ |
|
| * | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 2 | -3/+14 |
* | | | Fix UPSERTs on SQLite 3.24+ (#4477) | Amber Brown | 2019-01-28 | 2 | -4/+7 |
* | | | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 1 | -17/+2 |
* | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487) | Richard van der Hoff | 2019-01-28 | 1 | -1/+180 |
|/ / |
|
* | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 5 | -4/+14 |
|\ \ |
|
| * | | Fix tests | Erik Johnston | 2019-01-25 | 5 | -4/+14 |
* | | | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 2 | -1/+17 |
|/ / |
|
* | | Revert "Require event format version to parse or create events" | Erik Johnston | 2019-01-25 | 5 | -14/+4 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo... | Erik Johnston | 2019-01-24 | 5 | -14/+163 |
|\| |
|
| * | Look up the right SRV record | Richard van der Hoff | 2019-01-24 | 1 | -3/+9 |
| * | lots more tests for MatrixFederationAgent | Richard van der Hoff | 2019-01-24 | 1 | -10/+79 |
| * | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 1 | -1/+3 |
| |\ |
|
| | * | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -1/+3 |
| * | | Use native UPSERTs where possible (#4306) | Amber Brown | 2019-01-24 | 3 | -5/+20 |
| * | | Don't send IP addresses as SNI (#4452) | Richard van der Hoff | 2019-01-24 | 1 | -3/+60 |
* | | | Fix tests | Erik Johnston | 2019-01-24 | 5 | -4/+14 |
|/ / |
|
* | | fix python2 test failure | Richard van der Hoff | 2019-01-23 | 1 | -1/+1 |
* | | Add a test for MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -1/+195 |
* | | put resolve_service in an object | Richard van der Hoff | 2019-01-22 | 1 | -20/+18 |
* | | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 1 | -4/+4 |
* | | Make MatrixFederationClient use MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 1 | -0/+96 |
|/ |
|
* | Refactor and bugfix for resove_service (#4427) | Richard van der Hoff | 2019-01-22 | 2 | -14/+108 |
* | Require ECDH key exchange & remove dh_params (#4429) | Amber Brown | 2019-01-22 | 1 | -1/+0 |
* | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 1 | -7/+47 |
* | Fix incorrect logcontexts after a Deferred was cancelled (#4407) | Richard van der Hoff | 2019-01-17 | 1 | -0/+104 |
* | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2019-01-11 | 1 | -154/+1 |
|\ |
|
| * | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 | Richard van der Hoff | 2019-01-10 | 1 | -154/+1 |
| |\ |
|
| | * | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 1 | -154/+1 |
| | |\ |
|
| | | * | Skip macaroon check for access tokens in the db | Richard van der Hoff | 2019-01-10 | 1 | -148/+1 |
* | | | | Fix adding new rows instead of updating them if one of the key values is a NU... | Amber Brown | 2019-01-09 | 1 | -0/+71 |
|/ / / |
|
* | | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 1 | -3/+10 |
* | | | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 2 | -145/+44 |
* | | | Return well_known in /login response (#4319) | Richard van der Hoff | 2018-12-24 | 1 | -0/+3 |
* | | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5 | Richard van der Hoff | 2018-12-23 | 1 | -1/+23 |
|\ \ \ |
|
| * | | | Fix test_metrics.py compatibility prometheus_client 0.5 | Maarten de Vries | 2018-12-21 | 1 | -1/+23 |
* | | | | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 2 | -98/+334 |
|/ / / |
|
* | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 8 | -10/+204 |
* | | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 1 | -1/+1 |
* | | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 |
* | | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 1 | -1/+30 |
* | | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 1 | -15/+0 |
* | | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 1 | -0/+58 |
|/ / |
|
* | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205) | Richard van der Hoff | 2018-12-04 | 3 | -3/+98 |
* | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 1 | -1/+11 |
* | | Check logcontexts before and after each test (#4190) | Richard van der Hoff | 2018-11-27 | 2 | -8/+21 |
* | | Fix more logcontext leaks in tests (#4209) | Richard van der Hoff | 2018-11-27 | 1 | -1/+2 |
* | | Do a GC after each test to fix logcontext leaks (#4227) | Richard van der Hoff | 2018-11-27 | 1 | -2/+13 |
* | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 4 | -5/+8 |
|\ \ |
|
| * | | Fix logcontext leak in test_url_preview | Richard van der Hoff | 2018-11-19 | 1 | -1/+2 |
| * | | Fix logcontext leak in http pusher test | Richard van der Hoff | 2018-11-19 | 1 | -1/+2 |
| * | | Fix some tests which leaked logcontexts | Richard van der Hoff | 2018-11-19 | 2 | -3/+4 |
* | | | Fix fallback auth on Python 3 (#4197) | Amber Brown | 2018-11-19 | 1 | -0/+104 |
|/ / |
|
* | | Fix the terms UI auth tests | Travis Ralston | 2018-11-15 | 1 | -1/+1 |
* | | Fix Content-Disposition in media repository (#4176) | Amber Brown | 2018-11-15 | 2 | -0/+160 |
* | | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 3 | -0/+44 |
* | | Use <meta> tags to discover the per-page encoding of html previews (#4183) | Amber Brown | 2018-11-15 | 1 | -0/+77 |
* | | Add a test for the public T&Cs form | Richard van der Hoff | 2018-11-14 | 1 | -0/+7 |
* | | Add test to assert set_e2e_device_keys correctly returns False on no-op | Erik Johnston | 2018-11-08 | 1 | -0/+15 |
* | | Fix URL preview bugs (type error when loading cache from db, content-type inc... | Amber Brown | 2018-11-08 | 2 | -0/+166 |
* | | Remove some boilerplate in tests (#4156) | Amber Brown | 2018-11-07 | 10 | -216/+161 |
* | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 2 | -2/+5 |
* | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -42/+37 |
* | | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 3 | -5/+138 |
* | | Add some tests for the HTTP pusher (#4149) | Amber Brown | 2018-11-06 | 1 | -0/+159 |
* | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 1 | -1/+1 |
* | | Merge pull request #4137 from matrix-org/erikj/clean_up_events | Erik Johnston | 2018-11-02 | 2 | -3/+3 |
|\ \ |
|
| * | | Clean up event accesses and tests | Erik Johnston | 2018-11-02 | 2 | -3/+3 |
* | | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 2 | -1/+130 |
* | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_none | Erik Johnston | 2018-11-02 | 1 | -2/+98 |
|\ \ \ |
|
| * | | | Fix None exception in state res v2 | Erik Johnston | 2018-11-02 | 1 | -2/+98 |
| |/ / |
|
* | | | The tests also need a version parameter | Travis Ralston | 2018-10-31 | 1 | -1/+1 |
* | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 15 | -99/+716 |
|\| | |
|
| * | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -1/+105 |
| * | | Write some tests for the email pusher (#4095) | Amber Brown | 2018-10-30 | 5 | -3/+160 |
| * | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 1 | -9/+1 |
| |\ \ |
|
| | * | | fix broken test | Richard van der Hoff | 2018-10-25 | 1 | -9/+1 |
| * | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 2 | -0/+160 |
| |/ / |
|
| * | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -65/+110 |
| * | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 2 | -0/+115 |
| |\ \ |
|
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa... | Erik Johnston | 2018-10-25 | 7 | -23/+734 |
| | |\ \ |
|
| | * | | | Use allow/deny | Erik Johnston | 2018-10-25 | 2 | -5/+5 |
| | * | | | Add tests for alias creation rules | Erik Johnston | 2018-10-19 | 1 | -0/+48 |
| | * | | | Add tests for config generation | Erik Johnston | 2018-10-19 | 1 | -0/+67 |
| * | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_init | Neil Johnson | 2018-10-25 | 1 | -2/+8 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | fix style inconsistencies | Neil Johnson | 2018-10-24 | 1 | -2/+2 |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 5 | -4/+677 |
| | |\ \ \ |
|
| | * | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 1 | -2/+8 |
| | | |/ /
| | |/| | |
|
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea... | Neil Johnson | 2018-10-25 | 7 | -4/+1113 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| * | | | | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 1 | -4/+17 |
| * | | | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 7 | -205/+292 |
| |\ \ \ \ |
|
| * | | | | | move logic into register, fix room alias localpart bug, tests | Neil Johnson | 2018-10-04 | 2 | -19/+44 |
* | | | | | | pep8 | Travis Ralston | 2018-10-24 | 2 | -6/+3 |
* | | | | | | It helps to import things | Travis Ralston | 2018-10-24 | 1 | -0/+16 |
* | | | | | | Move test to where the other integration tests are | Travis Ralston | 2018-10-24 | 2 | -97/+109 |
* | | | | | | Fix test | Travis Ralston | 2018-10-24 | 1 | -25/+50 |
* | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 5 | -4/+677 |
|\ \ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_event_filter_valid... | Richard van der Hoff | 2018-10-24 | 4 | -3/+666 |
| |\ \ \ \ \ |
|
| | * \ \ \ \ | Merge pull request #4082 from matrix-org/rav/fix_pep8 | Richard van der Hoff | 2018-10-24 | 2 | -3/+3 |
| | |\ \ \ \ \ |
|
| | | * | | | | | Fix a number of flake8 errors | Richard van der Hoff | 2018-10-24 | 2 | -3/+3 |
| | | | |_|/ /
| | | |/| | | |
|
| | * | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 2 | -0/+663 |
| | |\ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | | * | | | | isort | Erik Johnston | 2018-10-24 | 1 | -4/+1 |
| | | * | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 1 | -2/+2 |
| | | * | | | | Add some state res v2 tests | Erik Johnston | 2018-10-16 | 2 | -0/+666 |
| * | | | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+11 |
| |/ / / / / |
|
* | | | | | | Fix terms UI auth test | Travis Ralston | 2018-10-18 | 1 | -2/+5 |
* | | | | | | Test for terms UI auth | Travis Ralston | 2018-10-18 | 1 | -0/+70 |
|/ / / / / |
|
* / / / / | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 1 | -0/+39 |
|/ / / / |
|
* | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 38 | -985/+1879 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Add tests | Erik Johnston | 2018-10-02 | 1 | -0/+45 |
| * | | | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 2 | -2/+7 |
| * | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -106/+0 |
| |\ \ \ |
|
| | * | | | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 1 | -1/+1 |
| | |\| | |
|
| | * | | | Remove redundant, failing, test | Richard van der Hoff | 2018-09-27 | 1 | -106/+0 |
| * | | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 4 | -95/+238 |
| | |/ /
| |/| | |
|
| * | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 1 | -1/+1 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 1 | -1/+1 |
| * | | | Include eventid in log lines when processing incoming federation transactions... | Richard van der Hoff | 2018-09-27 | 2 | -12/+21 |
| * | | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 1 | -0/+39 |
| |/ / |
|
| * | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 1 | -1/+0 |
| |\ \ |
|
| | * | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 1 | -1/+0 |
| * | | | Merge branch 'master' into develop | Amber Brown | 2018-09-25 | 1 | -2/+2 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Fix compatibility issue with older Twisted in tests. | Oleg Girko | 2018-09-25 | 1 | -2/+2 |
| * | | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 4 | -42/+202 |
| * | | | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 2 | -3/+74 |
| * | | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 3 | -37/+122 |
| |/ / |
|
| * | | Tests | Erik Johnston | 2018-09-14 | 1 | -0/+81 |
| * | | Attempt to figure out what's going on with timeouts (#3857) | Amber Brown | 2018-09-14 | 2 | -1/+198 |
| * | | improve naming | Neil Johnson | 2018-09-12 | 1 | -3/+3 |
| * | | expose number of real reserved users | Neil Johnson | 2018-09-12 | 1 | -0/+31 |
| * | | 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 |
| |/ / / |
|
* | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -4/+5 |
* | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -0/+1 |
* | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 89 | -2601/+3251 |
|\| | | |
|
| * | | | 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 |