| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache | Richard van der Hoff | 2018-09-25 | 44 | -39/+4 |
| |\ | |||||
| | * | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| | |\ | | | | | | | Fix some instances of ExpiringCache not expiring cache items | ||||
| | * | | added "media-src: 'self'" to CSP for resources (#3578) | Jérémy Farnaud | 2018-09-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse doesn’t allow for media resources to be played directly from Chrome. It is a problem for users on other networks (e.g. IRC) communicating with Matrix users through a gateway. The gateway sends them the raw URL for the resource when a Matrix user uploads a video and the video cannot be played directly in Chrome using that URL. Chrome argues it is not authorized to play the video because of the Content Security Policy. Chrome checks for the "media-src" policy which is missing, and defauts to the "default-src" policy which is "none". As Synapse already sends "object-src: 'self'" I thought it wouldn’t be a problem to add "media-src: 'self'" to the CSP to fix this problem. | ||||
| | * | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | Fix spurious exceptions when client closes conncetion | ||||
| | | * | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | Given we have disabled lazy loading for incr syncs in #3840, we can make self-LL more efficient by only doing it on initial sync. Also adds a bounds check for if/when we change our mind, so that we don't try to include LL members on sync responses with no timeline. | ||||
| | * | | | Merge branch 'master' into develop | Amber Brown | 2018-09-24 | 40 | -39/+0 |
| | |\ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| | |_|_|/ |/| | | | |||||
| * | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errors | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Handle exceptions thrown by background tasks | ||||
| | * | | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| | | |/ | |/| | |||||
| * | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | Should fix https://github.com/vector-im/riot-web/issues/7209 | ||||
| * | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links | Neil Johnson | 2018-09-20 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Neilj/fix room invite mail links | ||||
| | * \ \ | Merge remote-tracking branch 'origin/develop' into ↵ | Richard van der Hoff | 2018-09-18 | 13 | -0/+12 |
| | |\ \ \ | | | | | | | | | | | | | | | | neilj/fix_room_invite_mail_links | ||||
| | * | | | | towncrier | Neil Johnson | 2018-09-13 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 1 | -0/+1 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cache | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Remove get_destination_retry_timings cache | ||||
| | * | | | | Fix up changelog and remove spurious comment | Erik Johnston | 2018-09-19 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add a way to run tests in PostgreSQL in Docker (#3699) | Amber Brown | 2018-09-20 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Improve the logging when handling a federation transaction (#3904) | Richard van der Hoff | 2018-09-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's try to rationalise the logging that happens when we are processing an incoming transaction, to make it easier to figure out what is going wrong when they take ages. In particular: - make everything start with a [room_id event_id] prefix - make sure we log a warning when catching exceptions rather than just turning them into other, more cryptic, exceptions. | ||||
| * | | | | | Fixup | Erik Johnston | 2018-09-19 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | update changelog for #3909 | Richard van der Hoff | 2018-09-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3909 from turt2live/travis/fix-logging-1 | Amber Brown | 2018-09-19 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix matrixfederationclient.py logging: Destination is a string | ||||
| | * | | | | Changelog | Travis Ralston | 2018-09-18 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Remove documentation referencing Cygwin (#3873) | Amber Brown | 2018-09-19 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name | Amber Brown | 2018-09-19 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Set SNI to the server_name, not whatever was in the SRV record | ||||
| | * | | | | | changelog | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout | Amber Brown | 2018-09-19 | 1 | -0/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Bump timeout on get_missing_events request | ||||
| | * | | | | changelog | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| | |/ / / | |||||
| * | | | | Use directory server for room joins (#3899) | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When we do a join, always try the server we used for the alias lookup first. Fixes #2418 | ||||
| * | | | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to wait until we have read the response body before we log the request as complete, otherwise a confusing thing happens where the request appears to have completed, but we later fail it. To do this, we factor the salient details of a request out to a separate object, which can then keep track of the txn_id, so that it can be logged. | ||||
| * | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_version | Amber Brown | 2018-09-19 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / |/| | | | Add python_version phone home stat | ||||
| | * | | | Create 3894.feature | Will Hunt | 2018-09-17 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | don't ratelimit autojoins | ||||
| | * | | | | changelog | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #3882 from SimmyD/max_upload_docker_var | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add variable for changing the max upload size in Docker container | ||||
| | * | | | | | Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables. | Simon Dwyer | 2018-09-16 | 1 | -0/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Simon Dwyer <simon@thedwyers.co> | ||||
| * | | | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Return a 404 when deleting unknown room alias | ||||
| | * | | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metrics | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix more b'abcd' noise in metrics | ||||
| | * | | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add changelog | Aaron Raimist | 2018-09-17 | 1 | -0/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * / / / / | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| |/ / / / | |||||
| * / / / | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | missing changelog | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | Newsfile | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | don't filter membership events based on history visibility as we will already have filtered the messages in the timeline, and state events are always visible. and because @erikjohnston said so. | ||||
| * | | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2 | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | timeouts 2: electric boogaloo | ||||
| | * | | | changelog | Amber Brown | 2018-09-15 | 1 | -0/+1 |
| | |/ / | |||||
| * | | | Newsfile | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | Create 3860.misc | Travis Ralston | 2018-09-13 | 1 | -0/+1 |
| |/ / | |||||
| * | | merge (#3576) | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8 | Erik Johnston | 2018-09-13 | 1 | -0/+1 |
| |\ \ | | | | | | | Make purge history slightly faster | ||||
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-09-13 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | | | erikj/speed_up_purge | ||||
| | * | | | Newsfile | Erik Johnston | 2018-09-13 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3859 from matrix-org/erikj/add_iterkeys | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix handling of redacted events from federation | ||||
| | * | | | | Newsfile | Erik Johnston | 2018-09-13 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | fix circleci merged builds (#3858) | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | * fix * changelog | ||||
| * | / / | Attempt to figure out what's going on with timeouts (#3857) | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| | |/ / |/| | | |||||
| * | | | Remove some superfluous logging (#3855) | Amber Brown | 2018-09-13 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7 | Neil Johnson | 2018-09-12 | 1 | -0/+1 |
| |\ \ | | | | | | | expose number of real reserved users | ||||
| | * | | improve naming | Neil Johnson | 2018-09-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | towncrier | Neil Johnson | 2018-09-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | show heroes if a room has a 'deleted' name/canonical_alias (#3851) | Matthew Hodgson | 2018-09-12 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Log outbound requests when we retry | ||||
| | * | | | Newsfile | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3841 from matrix-org/erikj/manhole_key_length | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Change the manhole SSH key to have more bits | ||||
| | * | | | | Newsfile | Erik Johnston | 2018-09-11 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add JUnit summaries to CircleCI as well as merged runs (#3704) | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Port federation/ to py3 (#3847) | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #3835 from krombel/fix_3821 | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | fix VOIP crashes under Python 3 | ||||
| | * | | | | | add changelog | Krombel | 2018-09-10 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyring | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | add some logging for the keyring queue | ||||
| | * | | | | | | changelog | Richard van der Hoff | 2018-09-07 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_import | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix jwt import check | ||||
| | * | | | | | | | changelog | Richard van der Hoff | 2018-09-07 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Port rest/ to Python 3 (#3823) | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | | Port crypto/ to Python 3 (#3822) | Amber Brown | 2018-09-12 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 2 | -0/+2 |
| | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | * speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840) | ||||
| * | | | | | Newsfile | Mathijs van Gorcum | 2018-09-10 | 1 | -0/+1 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / |/| | | | Send existing room tags down sync on join | ||||
| | * | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-07 | 27 | -27/+0 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | changelog v0.33.4 github/release-v0.33.4 release-v0.33.4 | Amber Brown | 2018-09-07 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Create 3802.misc | Jan Christian Grünhage | 2018-09-06 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | version and towncrier v0.33.4rc1 | Amber Brown | 2018-09-04 | 27 | -27/+0 |
| | | | | | |||||
| * | | | | Port tests/ to Python 3 (#3808) | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 1 | -0/+1 |
| |\ \ \ \ | |_|/ / |/| | | | guest users should not be part of mau total | ||||
| | * | | | towncrier | Neil Johnson | 2018-09-05 | 1 | -0/+1 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Limit the number of PDUs/EDUs per fedreation transaction | ||||
| | * | | | Spelling | Erik Johnston | 2018-09-06 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Only start postgres instance for postgres tests on Travis CI | ||||
| | * | | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_id | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Remove conn_id from repl prometheus metrics | ||||
| | * | | | | Newsfile | Erik Johnston | 2018-09-03 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | User iter* during sync state calculations | ||||
| | * | | | | | Newsfile | Erik Johnston | 2018-09-05 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_dep | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | bump dep on pyopenssl to 16.x | ||||
| | * | | | | | changelog | Richard van der Hoff | 2018-09-06 | 1 | -0/+1 |
| | | |_|/ / | |/| | | | |||||
| * / | | | | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter | Richard van der Hoff | 2018-09-05 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Implement 'event_format' filter param in /sync | ||||
| | * | | | | changelog | Richard van der Hoff | 2018-09-04 | 1 | -0/+1 |
| | | |_|/ | |/| | | |||||
| * | | | | Port http/ to Python 3 (#3771) | Amber Brown | 2018-09-06 | 1 | -0/+1 |
| | |/ / |/| | | |||||
| * | | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5 | Neil Johnson | 2018-09-04 | 1 | -0/+1 |
| |\ \ \ | |/ / |/| | | improve human readable error messages | ||||
| | * | | towncrier | Neil Johnson | 2018-09-04 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fix tests on postgresql (#3740) | Amber Brown | 2018-09-04 | 1 | -0/+1 |
| | |/ |/| | |||||
| * | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 1 | -0/+1 |
| |\ \ | | | | | | | Remove unnecessary resolve_events_with_state_map | ||||
| | * | | Newsfile | Erik Johnston | 2018-09-03 | 1 | -0/+1 |
| | | | | |||||
| * | | | Create 3378.misc | Amber Brown | 2018-09-03 | 1 | -0/+1 |
| | |/ |/| | |||||
| * | | typo | Neil Johnson | 2018-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | news fragemnt | Neil Johnson | 2018-08-31 | 1 | -0/+1 |
| | | | |||||
| * | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init | Richard van der Hoff | 2018-08-30 | 1 | -0/+1 |
| |\ \ | | | | | | | Make sure that we close db connections opened during init | ||||
| | * | | changelog | Richard van der Hoff | 2018-08-28 | 1 | -0/+1 |
| | | | | |||||
| * | | | changelog | Krombel | 2018-08-29 | 2 | -1/+1 |
| | | | | |||||
| * | | | fix #3445 | Krombel | 2018-08-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3] but SortedDict only implements d.values() | ||||
| * | | | Update CONTRIBUTING to clarify miscs & Markdown (#3730) | Amber Brown | 2018-08-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 1 | -0/+1 |
| |/ / | | | | | don't return non-LL-member state in incremental sync state blocks | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| |/ / | |||||
| * | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1 | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| |\ \ | | | | | | | Allow federation_domain_whitelist to be emtpy list | ||||
| | * | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Fix bug where we broke sync when using limit_usage_by_mau | ||||
| | * | | | Newsfile | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | |/ / | |||||
| * | | | Merge pull request #3751 from matrix-org/rav/twisted_17 | Richard van der Hoff | 2018-08-24 | 1 | -0/+1 |
| |\ \ \ | |/ / |/| | | Pin to twisted 17.1 or later | ||||
| | * | | changelog | Richard van der Hoff | 2018-08-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| |/ / | |||||
| * | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #3734 from matrix-org/travis/worker-docs | Travis Ralston | 2018-08-23 | 1 | -0/+1 |
| |\ \ | | | | | | | Reference that the federation_reader needs the HTTP replication port set | ||||
| | * | | Create 3734.misc | Travis Ralston | 2018-08-21 | 1 | -0/+1 |
| | | | | |||||
| * | | | Newsfile | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-22 | 40 | -33/+7 |
| |\ \ \ | | |/ | |/| | | | | neilj/server_notices_on_blocking | ||||
| | * | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-22 | 1 | -1/+0 |
| | |\ \ | |||||
| | | * | | Revert "Use recaptcha_ajax.js directly from Google" | Richard van der Hoff | 2018-08-13 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-event | Erik Johnston | 2018-08-22 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | Allow guests to use /rooms/:roomId/event/:eventId | ||||
| | | * | | | 3724.feature | Will Hunt | 2018-08-20 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 1 | -0/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | Allow profile updates to happen on workers | ||||
| | | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-17 | 83 | -54/+25 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/split_profiles | ||||
| | | * | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor state module to support multiple room versions | ||||
| | | * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-20 | 33 | -0/+33 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_state_handler | ||||
| | | * | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spelling | Richard van der Hoff | 2018-08-22 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | limt -> limit | ||||
| | | * | | | | | | | | Create 3735.misc | Travis Ralston | 2018-08-21 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.3' into develop | Richard van der Hoff | 2018-08-22 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-21 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Split the state_group_cache in two (#3726) | Matthew Hodgson | 2018-08-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits the state_group_cache in two. One half contains normal state events; the other contains member events. The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache. This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching. Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow. Hopefully fixes https://github.com/matrix-org/synapse/issues/3720. | ||||
| | * | | | | | | | | | Merge tag 'v0.33.3rc2' into develop | Richard van der Hoff | 2018-08-21 | 42 | -42/+0 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723)) | ||||
| | | * | | | | | | | | changelog v0.33.3rc2 | Amber Brown | 2018-08-21 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-20 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | changelog v0.33.3rc1 | Amber Brown | 2018-08-21 | 42 | -42/+0 |
| | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keys | Erik Johnston | 2018-08-21 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't log exceptions when failing to fetch server keys | ||||
| | | * | | | | | | | | Newsfile | Erik Johnston | 2018-08-21 | 1 | -0/+1 |
| | | |/ / / / / / / | |||||
| | * / / / / / / / | Newsfile | Erik Johnston | 2018-08-20 | 1 | -0/+1 |
| | |/ / / / / / / | |||||
| | * | | / / / / | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 1 | -0/+1 |
| | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | | Newsfile | Erik Johnston | 2018-08-20 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_logging | Erik Johnston | 2018-08-20 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix logging bug in EDU handling over replication | ||||
| | | * | | | | | | Newsfile | Erik Johnston | 2018-08-17 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Logcontexts for replication command handlers | ||||
| | | * | | | | | | | changelog | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix logcontexts for running pushers | ||||
| | | * | | | | | | | changelog | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove v1/register's broken shared secret functionality (#3703) | Amber Brown | 2018-08-18 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use a producer to stream back responses | ||||
| | | * | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producers | Richard van der Hoff | 2018-08-17 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor request logging code | ||||
| | | * | | | | | | | | changelog | Richard van der Hoff | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | | | | | | | | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 3 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | | | | | | | | | Merge pull request #3708 from ↵ | Neil Johnson | 2018-08-17 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neilj/resource_Limit_block_event_creation Neilj/resource limit block event creation | ||||
| | | * | | | | | | | | | For resource limit blocked users, prevent writing into rooms | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * / | | | | | | | | Create 3712.misc | Travis Ralston | 2018-08-17 | 1 | -0/+1 |
| | |/ / / / / / / / | |||||
| | * / / / / / / / | Newsfile | Erik Johnston | 2018-08-16 | 1 | -0/+1 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-16 | 2 | -0/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | | | | | | | Add GET media/v1/config (#3184) | Will Hunt | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | | | | | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 2 | -0/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix Mau off by one errors | ||||
| | | * | | | | | | | Fix mau blocking calulation bug on login | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Remove incorrectly re-added changelog files | Richard van der Hoff | 2018-08-15 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were removed for the 0.33.2 release, but were incorrectly re-added in | ||||
| | * | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 3 | -0/+3 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 15 | -0/+15 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | * | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Move more federation APIs to workers | ||||
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 73 | -54/+15 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| | | * | | | | | | | Newsfile | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | support admin_email config and pass through into blocking errors, | ||||
| | | * | | | | | | remove changelog referencing another PR | Neil Johnson | 2018-08-15 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵ | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email | ||||
| | | | * | | | | | | update resource limit error codes | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | update admin email to uri | Neil Johnson | 2018-08-15 | 1 | -1/+1 |
| | | |/ / / / / / | |||||
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 6 | -0/+6 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | set admin email via config | Neil Johnson | 2018-08-13 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | combine mau metrics into one group | ||||
| | | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 2 | -0/+2 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | neilj/change_prometheus_mau_metric_name | ||||
| | | * | | | | | | | | Rename MAU prometheus metric | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | ||||
| | | * | | | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | ||||
| | * | | | | | | | | Fix missing yield in ↵ | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse.storage.monthly_active_users.initialise_reserved_users | ||||
| | * | | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | Block ability to read via sync if mau limit exceeded | ||||
| | * | | | | | | | | Dockerised sytest (#3660) | Amber Brown | 2018-08-14 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'origin/develop' into ↵ | Amber Brown | 2018-08-14 | 4 | -0/+4 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_reap_users_in_postgres | ||||
| | | * | | | | | | | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base | Jan Christian Grünhage | 2018-08-14 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | update docker base-image to alpine 3.8 | ||||
| | | | * | | | | | | | update docker base-image to alpine 3.8 | Jan Christian Grünhage | 2018-08-09 | 1 | -0/+1 |
| | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | | * | | | | | | | Name changelog after PR, not bug | Richard van der Hoff | 2018-08-13 | 1 | -0/+0 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge pull request #3677 from andrewshadura/master | Richard van der Hoff | 2018-08-13 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | Use recaptcha_ajax.js directly from Google | ||||
| | | | * | | | | | | Use recaptcha_ajax.js directly from Google | Andrej Shadura | 2018-08-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script recaptcha_ajax.js contains minified non-free code which we probably cannot redistribute. Since it talks to Google servers anyway, it is better to just download it from Google directly instead of shipping it. This fixes #1932. | ||||
| | | * | | | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixes test_reap_monthly_active_users so it passes under postgres | Neil Johnson | 2018-08-11 | 1 | -0/+1 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-tests | Amber Brown | 2018-08-11 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Blackify the tests | ||||
| | | * | | | | | | | changelog | Amber Brown | 2018-08-10 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into develop | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | | * | | | | | | | changelog | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | send SNI for federation requests | ||||
| | | * | | | | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 50 | -7/+37 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 12 | -0/+7 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | ||||
| | | * \ \ \ \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 2 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py | ||||
| | | * | | | | | | | | | towncrier changelog | Jeroen | 2018-06-26 | 1 | -0/+1 |
| | | / / / / / / / / | |||||
| * | | | | | / / / / | server notices for resource limit blocking | Neil Johnson | 2018-08-10 | 1 | -0/+1 |
| | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Where server is disabled, block ability for locked out users to read new ↵ | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | messages | ||||
| * | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Flag to disable HS without disabling federation | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Ability to disable client/server Synapse via conf toggle | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 58 | -54/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| | * | | | | | | | | | changelog | Amber Brown | 2018-08-07 | 58 | -54/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | ||||
| | * | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-03 | 12 | -0/+12 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet | ||||
| | * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-31 | 1 | -0/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | more metrics for the federation and appservice senders | ||||
| | * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-07 | 1 | -0/+1 |
| | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | Support for room versioning | ||||
| | * | | | | | | | | | | changelog | Richard van der Hoff | 2018-08-06 | 1 | -0/+1 |
| | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-08 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | neilj/reserved_users | ||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |