Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | version | Amber Brown | 2018-09-07 | 1 | -1/+1 | |
| * | | | | | | Bump version and changelog | Erik Johnston | 2018-09-06 | 1 | -1/+1 | |
| * | | | | | | Merge tag 'v0.33.3.1' into release-v0.33.4 | Erik Johnston | 2018-09-06 | 4 | -31/+125 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | version and towncrier v0.33.4rc1 | Amber Brown | 2018-09-04 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | ensure guests never enter mau list | Neil Johnson | 2018-09-06 | 1 | -4/+3 | |
| * | | | | | | | guest users should not be part of mau total | Neil Johnson | 2018-09-05 | 1 | -1/+6 | |
* | | | | | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus | Amber Brown | 2018-09-07 | 1 | -0/+12 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Limit the number of PDUs/EDUs per fedreation transaction | Erik Johnston | 2018-09-06 | 1 | -0/+12 | |
* | | | | | | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_id | Amber Brown | 2018-09-07 | 1 | -12/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove conn_id | Erik Johnston | 2018-09-04 | 1 | -2/+2 | |
| * | | | | | | | | | Remove conn_id from repl prometheus metrics | Erik Johnston | 2018-09-03 | 1 | -10/+10 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | User iter* during sync state calculations | Erik Johnston | 2018-09-05 | 1 | -8/+8 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_dep | Amber Brown | 2018-09-07 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | bump dep on pyopenssl to 16.x | Richard van der Hoff | 2018-09-06 | 1 | -2/+2 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 6 | -19/+22 | |
| |_|_|_|/ / / |/| | | | | | | ||||||
* | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-09-06 | 5 | -32/+126 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | ||||||
| * | | | | | prepare v0.33.3.1 v0.33.3.1 github/release-v0.33.3.1 release-v0.33.3.1 | Richard van der Hoff | 2018-09-06 | 1 | -1/+1 | |
| * | | | | | Fix origin handling for pushed transactions | Richard van der Hoff | 2018-09-05 | 3 | -15/+15 | |
| * | | | | | Check that signatures on events are valid | Richard van der Hoff | 2018-09-05 | 1 | -16/+110 | |
* | | | | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter | Richard van der Hoff | 2018-09-05 | 2 | -13/+39 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Implement 'event_format' filter param in /sync | Richard van der Hoff | 2018-09-04 | 2 | -13/+39 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Port http/ to Python 3 (#3771) | Amber Brown | 2018-09-06 | 6 | -184/+130 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5 | Neil Johnson | 2018-09-04 | 2 | -7/+21 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | improve human readable error message | Neil Johnson | 2018-09-04 | 1 | -1/+2 | |
| * | | | | improve human readable error messages | Neil Johnson | 2018-09-04 | 2 | -7/+20 | |
* | | | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 3 | -57/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Remove unnecessary resolve_events_with_state_map | Erik Johnston | 2018-08-22 | 3 | -57/+7 | |
* | | | | | assert rather than warn hhs-4 | Neil Johnson | 2018-08-31 | 1 | -3/+2 | |
* | | | | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 5 | -21/+35 | |
* | | | | | fix reference to is_threepid_reserved | Neil Johnson | 2018-08-31 | 1 | -1/+1 | |
* | | | | | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 4 | -6/+24 | |
* | | | | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 4 | -3/+21 | |
* | | | | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 11 | -31/+77 | |
* | | | | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init | Richard van der Hoff | 2018-08-30 | 12 | -48/+30 | |
|\ \ \ \ \ | ||||||
| * | | | | | use abc.abstractproperty | Richard van der Hoff | 2018-08-28 | 1 | -5/+4 | |
| * | | | | | Make sure that we close db connections opened during init | Richard van der Hoff | 2018-08-28 | 12 | -48/+31 | |
* | | | | | | fix #3445 | Krombel | 2018-08-29 | 1 | -2/+2 | |
* | | | | | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 1 | -1/+8 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact | Erik Johnston | 2018-08-24 | 1 | -4/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix checking if service notice room is already tagged | Erik Johnston | 2018-08-24 | 1 | -4/+3 | |
| | |_|_|/ | |/| | | | ||||||
* / | | | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 4 | -8/+8 | |
|/ / / / | ||||||
* | | | | Ensure we wake up /sync when we add tag to notice room | Erik Johnston | 2018-08-24 | 2 | -2/+13 | |
* | | | | Make content of tag an empty object rather than null | Erik Johnston | 2018-08-24 | 2 | -2/+2 | |
* | | | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1 | Erik Johnston | 2018-08-24 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix bug when federation_domain_whitelist is an emtpy list | Erik Johnston | 2018-08-24 | 1 | -1/+1 | |
* | | | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse | Erik Johnston | 2018-08-24 | 1 | -0/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix bug where we broke sync when using limit_usage_by_mau | Erik Johnston | 2018-08-24 | 1 | -0/+4 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #3751 from matrix-org/rav/twisted_17 | Richard van der Hoff | 2018-08-24 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Pin to twisted 17.1 or later | Richard van der Hoff | 2018-08-24 | 1 | -1/+1 | |
* | | | | | Implement trail users | Erik Johnston | 2018-08-23 | 4 | -2/+43 | |
|/ / / / | ||||||
* | | | | Fix bug where we resent "limit exceeded" server notices | Erik Johnston | 2018-08-23 | 1 | -1/+5 | |
* | | | | Add missing yield | Erik Johnston | 2018-08-23 | 1 | -1/+2 | |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Erik Johnston | 2018-08-22 | 55 | -603/+1130 | |
|\| | | | ||||||
| * | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-22 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | Use recaptcha_ajax.js directly from Google | Richard van der Hoff | 2018-08-22 | 2 | -196/+1 | |
| | * | | | Merge tag 'v0.33.3' | Richard van der Hoff | 2018-08-22 | 103 | -916/+2769 | |
| | |\| | | ||||||
| | | * | | bump version to 0.33.3 | Richard van der Hoff | 2018-08-22 | 1 | -1/+1 | |
| | * | | | Revert "Use recaptcha_ajax.js directly from Google" | Richard van der Hoff | 2018-08-13 | 2 | -1/+196 | |
| * | | | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-event | Erik Johnston | 2018-08-22 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Allow guests to access /rooms/:roomId/event/:eventId | Will Hunt | 2018-08-20 | 1 | -1/+1 | |
| * | | | | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 6 | -42/+74 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Rename WorkerProfileHandler to BaseProfileHandler | Erik Johnston | 2018-08-22 | 2 | -5/+12 | |
| | * | | | | | Add assert to ensure handler is only run on master | Erik Johnston | 2018-08-22 | 1 | -0/+2 | |
| | * | | | | | Remove redundant vars | Erik Johnston | 2018-08-22 | 1 | -3/+0 | |
| | * | | | | | Add some fixmes | Erik Johnston | 2018-08-17 | 2 | -0/+6 | |
| | * | | | | | Call UserDirectoryHandler methods directly | Erik Johnston | 2018-08-17 | 4 | -104/+8 | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-17 | 68 | -538/+1330 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 2 | -9/+19 | |
| | * | | | | | | Remote profile cache should remain in master worker | Erik Johnston | 2018-08-17 | 1 | -4/+2 | |
| | * | | | | | | Docstrings | Erik Johnston | 2018-08-09 | 1 | -1/+11 | |
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-09 | 30 | -126/+667 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Allow ratelimiting on workers | Erik Johnston | 2018-08-07 | 1 | -29/+29 | |
| | * | | | | | | | Allow profile changes to happen on workers | Erik Johnston | 2018-08-07 | 5 | -8/+106 | |
| * | | | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 6 | -271/+388 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2018-08-20 | 81 | -748/+1735 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Remove redundant room_version checks | Erik Johnston | 2018-08-20 | 2 | -15/+4 | |
| | * | | | | | | | | | Revert spurious change | Erik Johnston | 2018-08-20 | 1 | -2/+2 | |
| | * | | | | | | | | | Add fast path in state res for zero prev events | Erik Johnston | 2018-08-09 | 1 | -1/+6 | |
| | * | | | | | | | | | Choose state algorithm based on room version | Erik Johnston | 2018-08-09 | 4 | -16/+105 | |
| | * | | | | | | | | | Add constants for room versions | Erik Johnston | 2018-08-09 | 1 | -2/+7 | |
| | * | | | | | | | | | Refactor state module | Erik Johnston | 2018-08-09 | 2 | -296/+325 | |
| * | | | | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spelling | Richard van der Hoff | 2018-08-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | limt -> limit | Travis Ralston | 2018-07-31 | 1 | -1/+1 | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.3' into develop | Richard van der Hoff | 2018-08-22 | 1 | -3/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | fix another consent encoding fail | Richard van der Hoff | 2018-08-21 | 1 | -1/+1 | |
| | * | | | | | | | | | | Fix 500 error from /consent form | Richard van der Hoff | 2018-08-21 | 1 | -2/+11 | |
| * | | | | | | | | | | | Split the state_group_cache in two (#3726) | Matthew Hodgson | 2018-08-22 | 1 | -17/+141 | |
| * | | | | | | | | | | | Merge tag 'v0.33.3rc2' into develop | Richard van der Hoff | 2018-08-21 | 3 | -4/+18 | |
| |\| | | | | | | | | | | ||||||
| | * | | | | | | | | | | changelog v0.33.3rc2 | Amber Brown | 2018-08-21 | 1 | -1/+1 | |
| | * | | | | | | | | | | Fix exceptions when a connection is closed before we read the headers | Richard van der Hoff | 2018-08-20 | 2 | -2/+10 | |
| | * | | | | | | | | | | Robustness fix for logcontext filter | Richard van der Hoff | 2018-08-20 | 1 | -1/+7 | |
| | * | | | | | | | | | | version | Amber Brown | 2018-08-21 | 1 | -1/+1 | |
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keys | Erik Johnston | 2018-08-21 | 2 | -5/+9 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Log more detail when we fail to authenticate request | Erik Johnston | 2018-08-21 | 1 | -3/+3 | |
| | * | | | | | | | | | | Don't log exceptions when failing to fetch server keys | Erik Johnston | 2018-08-21 | 2 | -4/+8 | |
| | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | Fix typo | Erik Johnston | 2018-08-21 | 1 | -4/+4 | |
| * | | | | | | | | | | isort | Erik Johnston | 2018-08-21 | 1 | -1/+2 | |
| * | | | | | | | | | | Make the in flight requests metrics thread safe | Erik Johnston | 2018-08-20 | 1 | -3/+10 | |
| * | | | | | | | | | | Make the in flight background process metrics thread safe | Erik Johnston | 2018-08-20 | 1 | -5/+20 | |
| |/ / / / / / / / / | ||||||
| * | | / / / / / / | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 11 | -40/+90 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Use get_cache_factor_for function for `state_cache` | Erik Johnston | 2018-08-20 | 1 | -2/+2 | |
| * | | | | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_logging | Erik Johnston | 2018-08-20 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix logging bug in EDU handling over replication | Erik Johnston | 2018-08-17 | 1 | -1/+1 | |
| * | | | | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands | Richard van der Hoff | 2018-08-17 | 8 | -20/+53 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Logcontexts for replication command handlers | Richard van der Hoff | 2018-08-17 | 8 | -20/+53 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 5 | -21/+28 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 5 | -21/+28 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 9 | -17/+90 | |
| * | | | | | | | | | Remove v1/register's broken shared secret functionality (#3703) | Amber Brown | 2018-08-18 | 1 | -54/+0 | |
| * | | | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 1 | -4/+13 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Use a producer to stream back responses | Richard van der Hoff | 2018-08-15 | 1 | -4/+13 | |
| * | | | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producers | Richard van der Hoff | 2018-08-17 | 2 | -92/+179 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Refactor request logging code | Richard van der Hoff | 2018-08-15 | 2 | -92/+179 | |
* | | | | | | | | | | | | Update notice format | Erik Johnston | 2018-08-22 | 2 | -5/+15 | |
* | | | | | | | | | | | | rename error code | Neil Johnson | 2018-08-18 | 2 | -4/+4 | |
* | | | | | | | | | | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+6 | |
* | | | | | | | | | | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -1/+1 | |
* | | | | | | | | | | | | clean up, no functional changes | Neil Johnson | 2018-08-17 | 2 | -41/+47 | |
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 3 | -6/+55 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse in... | Neil Johnson | 2018-08-17 | 6 | -3/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 6 | -3/+18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | ||||||
| * | / | | | | | | | | | | server limits config docs | Neil Johnson | 2018-08-17 | 1 | -0/+26 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 3 | -6/+28 | |
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 6 | -3/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | remove errant yield | Neil Johnson | 2018-08-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 3 | -2/+6 | |
| * | | | | | | | | | | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Fix inbound federation on reader worker | Erik Johnston | 2018-08-16 | 1 | -0/+2 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | flake8 | Neil Johnson | 2018-08-16 | 1 | -3/+2 | |
* | | | | | | | | | | refactor for readability, and reuse caching for setting tags | Neil Johnson | 2018-08-16 | 2 | -68/+114 | |
* | | | | | | | | | | add room tagging | Neil Johnson | 2018-08-16 | 1 | -9/+5 | |
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-16 | 4 | -3/+96 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Add GET media/v1/config (#3184) | Will Hunt | 2018-08-16 | 2 | -1/+50 | |
| * | | | | | | | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 2 | -2/+46 | |
* | | | | | | | | | | check for room state before deciding on action | Neil Johnson | 2018-08-16 | 2 | -67/+26 | |
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-16 | 5 | -18/+158 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 5 | -18/+158 | |
* | | | | | | | | | | WIP impl commiting to get feedback | Neil Johnson | 2018-08-16 | 1 | -6/+74 | |
* | | | | | | | | | | fix case where empty string state check is evaulated as False | Neil Johnson | 2018-08-16 | 1 | -1/+2 | |
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-15 | 5 | -20/+172 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... | Neil Johnson | 2018-08-15 | 23 | -178/+591 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... | Neil Johnson | 2018-08-14 | 2 | -2/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-14 | 1 | -1/+0 | |
| | * | | | | | | | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 1 | -2/+2 | |
| | * | | | | | | | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 1 | -10/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-14 | 4 | -17/+35 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei... | Neil Johnson | 2018-08-14 | 3 | -8/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 4 | -18/+170 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-15 | 59 | -489/+855 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 14 | -138/+498 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-15 | 54 | -337/+368 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 2 | -48/+10 | |
| | * | | | | | | | | | | | | | Rename slave TransactionStore to SlaveTransactionStore | Erik Johnston | 2018-08-15 | 6 | -11/+11 | |
| | * | | | | | | | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 2 | -2/+49 | |
| | * | | | | | | | | | | | | | Fixup doc comments | Erik Johnston | 2018-08-09 | 2 | -0/+28 | |
| | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-09 | 30 | -126/+667 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Pull in necessary stores in federation_reader | Erik Johnston | 2018-08-06 | 2 | -1/+2 | |
| | * | | | | | | | | | | | | | Move necessary storage functions to worker classes | Erik Johnston | 2018-08-06 | 3 | -98/+100 | |
| | * | | | | | | | | | | | | | Import all functions from TransactionStore | Erik Johnston | 2018-08-06 | 1 | -11/+2 | |
| | * | | | | | | | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 4 | -13/+62 | |
| | * | | | | | | | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 4 | -10/+290 | |
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 4 | -22/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 | |
| | * | | | | | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap... | Neil Johnson | 2018-08-15 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 1 | -2/+1 | |
| | * | | | | | | | | | | | | | update admin email to uri | Neil Johnson | 2018-08-15 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 3 | -8/+8 | |
| | * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 3 | -25/+56 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 | |
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 | |
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 4 | -17/+35 | |
| * | | | | | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name | Neil Johnson | 2018-08-15 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro... | Neil Johnson | 2018-08-14 | 3 | -9/+28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | | pep8 | Neil Johnson | 2018-08-14 | 1 | -0/+1 | |
| | * | | | | | | | | | | | combine mau metrics into one group | Neil Johnson | 2018-08-14 | 1 | -4/+3 | |
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 5 | -20/+78 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 | |
| | * | | | | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 5 | -20/+76 | |
| * | | | | | | | | | | | adding missing yield | 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 | -8/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 | |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po... | Amber Brown | 2018-08-14 | 4 | -196/+11 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 2 | -196/+1 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Use recaptcha_ajax.js directly from Google | Andrej Shadura | 2018-08-10 | 2 | -196/+1 | |
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | ||||||
| | * | | | | | | | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 4 | -35/+17 | |
| | * | | | | | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 4 | -17/+35 | |
| | * | | | | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 2 | -0/+10 | |
| * | | | | | | | | | fix sqlite/postgres incompatibility in reap_monthly_active_users | Neil Johnson | 2018-08-11 | 1 | -16/+28 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into develop | Richard van der Hoff | 2018-08-10 | 1 | -43/+68 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Fix linearizer cancellation on twisted < 18.7 | Richard van der Hoff | 2018-08-10 | 1 | -43/+68 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | log *after* reloading log config | Richard van der Hoff | 2018-08-10 | 1 | -2/+1 | |
| * | | | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 29 | -31/+31 | |
| * | | | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 13 | -16/+110 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| | * | | | | | | | more generic conversion of str/bytes to unicode | Jeroen | 2018-08-09 | 1 | -1/+1 | |
| | * | | | | | | | include private functions from twisted | Jeroen | 2018-08-09 | 1 | -2/+35 | |
| | * | | | | | | | updated docstring for ServerContextFactory | Jeroen | 2018-08-08 | 1 | -1/+1 | |
| | * | | | | | | | fix isort | Jeroen | 2018-07-29 | 1 | -2/+3 | |
| | * | | | | | | | fix accidental removal of hs | Jeroen | 2018-07-27 | 1 | -1/+1 | |
| | * | | | | | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 72 | -1162/+2278 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... | Jeroen | 2018-07-14 | 259 | -1767/+1825 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 68 | -191/+791 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | take idna implementation from twisted | Jeroen | 2018-06-26 | 1 | -2/+2 | |
| | * | | | | | | | | | | allow self-signed certificates | Jeroen | 2018-06-26 | 3 | -35/+36 | |
| | * | | | | | | | | | | formatting changes for pep8 | Jeroen | 2018-06-25 | 4 | -5/+8 | |
| | * | | | | | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 14 | -13/+69 | |
* | | | | | | | | | | | | wip cut at sending resource server notices | Neil Johnson | 2018-08-15 | 2 | -44/+55 | |
* | | | | | | | | | | | | add new event types | Neil Johnson | 2018-08-15 | 1 | -0/+1 | |
* | | | | | | | | | | | | backout ability to pass in event type to server notices | Neil Johnson | 2018-08-14 | 3 | -4/+5 | |
* | | | | | | | | | | | | support server notice state events for resource limits | Neil Johnson | 2018-08-14 | 4 | -8/+22 | |
* | | | | | | | | | | | | fix typo | Neil Johnson | 2018-08-13 | 1 | -1/+1 | |
* | | | | | | | | | | | | implementation of server notices to alert on hitting resource limits | Neil Johnson | 2018-08-10 | 2 | -45/+65 | |
* | | | | | | | | | | | | wip at implementing MSC 7075 | Neil Johnson | 2018-08-09 | 1 | -0/+84 | |
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 2 | -6/+6 | |
* | | | | | | | | | | | fix errant parenthesis | 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 | 2 | -3/+17 | |
* | | | | | | | | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -7/+5 | |
* | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 3 | -0/+9 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 3 | -0/+9 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 | |
| | * | | | | | | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 12 | -22/+240 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 3 | -6/+54 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs | Neil Johnson | 2018-08-08 | 4 | -37/+69 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 2 | -8/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 3 | -0/+9 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 21 | -298/+667 | |
|\| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | 0.33.2 | Amber Brown | 2018-08-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | fix for rc1 v0.33.2rc1 | Amber Brown | 2018-08-07 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | version | Amber Brown | 2018-08-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 5 | -274/+395 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 1 | -2/+1 | |
| | * | | | | | | | | | | | | | | | | Rename POST param to METHOD | Erik Johnston | 2018-08-08 | 2 | -13/+22 | |
| | * | | | | | | | | | | | | | | | | Fixup logging and docstrings | Erik Johnston | 2018-08-08 | 2 | -2/+40 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fix isort | Erik Johnston | 2018-08-06 | 1 | -4/+1 | |
| | * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r... | Erik Johnston | 2018-08-03 | 40 | -601/+707 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 2 | -195/+108 | |
| | * | | | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 2 | -86/+40 | |
| | * | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | Erik Johnston | 2018-07-31 | 1 | -0/+208 | |
| * | | | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 3 | -1/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | fix metric name | Richard van der Hoff | 2018-08-07 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 3 | -1/+32 | |
| | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 12 | -22/+239 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 3 | -15/+5 | |
| | * | | | | | | | | | | | | | | | Check m.room.create for sane room_versions | Richard van der Hoff | 2018-08-06 | 2 | -4/+32 | |
| | * | | | | | | | | | | | | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 4 | -8/+25 |