Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 3 | -30/+8 |
|\ | |||||
| * | Fix complete fail to do the right thing | Richard van der Hoff | 2018-09-28 | 2 | -1/+3 |
| * | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | remove spurious federation checks on localhost | Richard van der Hoff | 2018-09-26 | 1 | -31/+6 |
* | | Merge pull request #3980 from matrix-org/rav/remove_broken_cache_call | Richard van der Hoff | 2018-09-28 | 2 | -1/+1 |
|\ \ | |||||
| * | | Remove redundant call to start_get_pdu_cache | Richard van der Hoff | 2018-09-28 | 2 | -1/+1 |
* | | | build python 3 docker images on circle CI (#3976) | Jan Christian Grünhage | 2018-09-28 | 2 | -5/+12 |
|/ / | |||||
* | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 2 | -3/+20 |
|\ \ | |||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 177 | -1345/+2545 |
| |\ \ | |||||
| * | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| * | | | Improve performance of getting typing updates for replication | Erik Johnston | 2018-09-05 | 1 | -3/+19 |
* | | | | Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload | Richard van der Hoff | 2018-09-27 | 2 | -0/+27 |
|\ \ \ \ | |||||
| * | | | | Do the changelog.d dance | Michael Kaye | 2018-09-27 | 1 | -0/+1 |
| * | | | | Make a ":latest" tag, and a SHA1 commit ID one too. | Michael Kaye | 2018-09-27 | 1 | -3/+16 |
| * | | | | Also, don't run this job on any branches | Michael Kaye | 2018-09-27 | 1 | -1/+3 |
| * | | | | Make username configurable in the UI too | Michael Kaye | 2018-09-27 | 1 | -1/+1 |
| * | | | | Fix typo | Michael Kaye | 2018-09-27 | 1 | -1/+1 |
| * | | | | Build and push docker image to hub | Michael Kaye | 2018-09-27 | 1 | -0/+11 |
* | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 3 | -4/+11 |
|\ \ \ \ \ | |||||
| * | | | | | more comments | Richard van der Hoff | 2018-09-27 | 2 | -6/+3 |
| * | | | | | changelog | Richard van der Hoff | 2018-09-27 | 1 | -0/+1 |
| * | | | | | Clarifications in FederationHandler | Richard van der Hoff | 2018-09-27 | 1 | -2/+11 |
| |/ / / / | |||||
* | | | | | Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process | Amber Brown | 2018-09-27 | 2 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | | Run notify_app_services as a bg process | Richard van der Hoff | 2018-09-26 | 1 | -2/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 19 | -19/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Update 3970.bugfix | Amber Brown | 2018-09-27 | 1 | -1/+1 |
| * | | | | | Added changelog fragment | Schnuffle | 2018-09-27 | 1 | -0/+1 |
| * | | | | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 18 | -19/+19 |
* | | | | | | Run our oldest supported configuration in CI (#3952) | Amber Brown | 2018-09-27 | 4 | -13/+38 |
* | | | | | | Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts | Richard van der Hoff | 2018-09-27 | 2 | -1/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | towncrier | Neil Johnson | 2018-09-26 | 1 | -0/+1 |
| * | | | | | fix #3854 | Neil Johnson | 2018-09-26 | 1 | -1/+4 |
* | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 3 | -2/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 3 | -2/+17 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Include eventid in log lines when processing incoming federation transactions... | Richard van der Hoff | 2018-09-27 | 6 | -57/+115 |
* | | | | | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 3 | -8/+62 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #3963 from matrix-org/rav/get_state_for_room_docstring | Amber Brown | 2018-09-27 | 2 | -4/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| * | | | | fix docstring for FederationClient.get_state_for_room | Richard van der Hoff | 2018-09-26 | 1 | -4/+4 |
|/ / / / | |||||
* / / / | Reduce the load on our CI (#3957) | Amber Brown | 2018-09-27 | 3 | -8/+30 |
|/ / / | |||||
* | | | Merge branch 'develop' into rav/hacky_cache_factor_fix | Richard van der Hoff | 2018-09-26 | 6 | -315/+320 |
|\ \ \ | |||||
| * \ \ | Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len | Richard van der Hoff | 2018-09-26 | 3 | -20/+25 |
| |\ \ \ | |||||
| | * | | | Log which cache is throwing exceptions | Richard van der Hoff | 2018-09-26 | 1 | -10/+17 |
| | * | | | changelog | Richard van der Hoff | 2018-09-26 | 1 | -0/+1 |
| | * | | | Fix ExpiringCache.__len__ to be accurate | Erik Johnston | 2018-09-26 | 1 | -10/+7 |
| * | | | | Merge pull request #3948 from matrix-org/rav/no_symlink_synctl | Amber Brown | 2018-09-26 | 3 | -285/+285 |
| |\ \ \ \ | |||||
| | * | | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| | * | | | | Move synctl into top dir to avoid a symlink | Richard van der Hoff | 2018-09-25 | 2 | -285/+284 |
* | | | | | | Actuall set cache factors in workers | Erik Johnston | 2018-09-26 | 1 | -5/+15 |
|/ / / / / | |||||
* | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 3 | -24/+48 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | changelog | Richard van der Hoff | 2018-09-20 | 1 | -0/+1 |
| * | | | | Comments and interface cleanup for on_receive_pdu | Richard van der Hoff | 2018-09-20 | 2 | -24/+47 |
* | | | | | Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3 | Richard van der Hoff | 2018-09-25 | 3 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Update Dockerfile | Jan Christian Grünhage | 2018-09-25 | 1 | -1/+0 |
| * | | | | | Update .dockerignore | Jan Christian Grünhage | 2018-09-25 | 1 | -1/+0 |
| * | | | | | add changelog | Jan Christian Grünhage | 2018-09-20 | 1 | -0/+1 |
| * | | | | | make python 3 work in the docker container | Jan Christian Grünhage | 2018-09-20 | 3 | -2/+6 |
* | | | | | | Update grafana dashboard | Richard van der Hoff | 2018-09-25 | 1 | -175/+417 |
* | | | | | | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 17 | -39/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Newsfile | Erik Johnston | 2018-09-21 | 1 | -0/+1 |
| * | | | | | | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 16 | -39/+12 |
* | | | | | | | added "media-src: 'self'" to CSP for resources (#3578) | Jérémy Farnaud | 2018-09-25 | 2 | -0/+2 |
* | | | | | | | Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered | Richard van der Hoff | 2018-09-25 | 2 | -14/+36 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | | Fix spurious exceptions when client closes conncetion | Erik Johnston | 2018-09-20 | 1 | -14/+35 |
* | | | | | | | | Merge pull request #3947 from matrix-org/rav/attr_version | Richard van der Hoff | 2018-09-25 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-25 | 1 | -0/+1 |
| * | | | | | | | We require attrs 16.0.0 | Richard van der Hoff | 2018-09-25 | 1 | -1/+3 |
|/ / / / / / / | |||||
* | | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 2 | -5/+9 |
* | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-25 | 3 | -3/+13 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge tag 'v0.33.5.1' | Amber Brown | 2018-09-25 | 3 | -3/+13 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | changelog v0.33.5.1 github/release-v0.33.5.1 release-v0.33.5.1 | Amber Brown | 2018-09-25 | 2 | -2/+10 |
| | * | | | | | | | bump version | Amber Brown | 2018-09-25 | 1 | -1/+1 |
| | * | | | | | | | changelog for 3940 | Amber Brown | 2018-09-25 | 1 | -0/+2 |
| | * | | | | | | | Fix compatibility issue with older Twisted in tests. | Oleg Girko | 2018-09-25 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-24 | 42 | -40/+65 |
|\| | | | | | | | | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge tag 'v0.33.5' | Amber Brown | 2018-09-24 | 87 | -1091/+1998 |
| |\| | | | | | | |||||
| | * | | | | | | towncrier v0.33.5 github/release-v0.33.5 release-v0.33.5 | Amber Brown | 2018-09-24 | 1 | -0/+6 |
| | * | | | | | | update version | Amber Brown | 2018-09-24 | 1 | -1/+1 |
| | * | | | | | | changelog v0.33.5rc1 | Amber Brown | 2018-09-17 | 41 | -39/+58 |
| | * | | | | | | update python 3 changelog | Amber Brown | 2018-09-17 | 1 | -1/+1 |
| | * | | | | | | version | Amber Brown | 2018-09-17 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #3927 from matrix-org/erikj/handle_background_errors | Erik Johnston | 2018-09-21 | 2 | -0/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add missing logger | Erik Johnston | 2018-09-20 | 1 | -0/+4 |
| * | | | | | | | | Newsfile | Erik Johnston | 2018-09-20 | 1 | -0/+1 |
| * | | | | | | | | Handle exceptions thrown by background tasks | Erik Johnston | 2018-09-20 | 1 | -0/+2 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 2 | -0/+5 |
| |_|_|/ / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links | Neil Johnson | 2018-09-20 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail... | Richard van der Hoff | 2018-09-18 | 31 | -98/+351 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | towncrier | Neil Johnson | 2018-09-13 | 1 | -0/+1 |
| * | | | | | | | fix link for case that config.email_riot_base_url is set | Neil Johnson | 2018-09-13 | 1 | -1/+1 |
* | | | | | | | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 9 | -58/+238 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #3914 from matrix-org/erikj/remove_retry_cache | Erik Johnston | 2018-09-20 | 2 | -8/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix up changelog and remove spurious comment | Erik Johnston | 2018-09-19 | 2 | -3/+1 |
| * | | | | | | | pep8 | Erik Johnston | 2018-09-19 | 1 | -1/+0 |
| * | | | | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| * | | | | | | | Remove get_destination_retry_timings cache | Erik Johnston | 2018-09-19 | 1 | -5/+0 |
* | | | | | | | | Add a way to run tests in PostgreSQL in Docker (#3699) | Amber Brown | 2018-09-20 | 8 | -9/+79 |
* | | | | | | | | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 4 | -5/+77 |
* | | | | | | | | Improve the logging when handling a federation transaction (#3904) | Richard van der Hoff | 2018-09-19 | 3 | -56/+111 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #3910 from matrix-org/erikj/update_timeout | Erik Johnston | 2018-09-19 | 5 | -87/+52 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fixup | Erik Johnston | 2018-09-19 | 2 | -4/+1 |
| * | | | | | | Replace custom DeferredTimeoutError with defer.TimeoutError | Erik Johnston | 2018-09-19 | 2 | -12/+5 |
| * | | | | | | Run canceller first to allow it to generate correct error | Erik Johnston | 2018-09-19 | 1 | -2/+5 |
| * | | | | | | Newsfile | Erik Johnston | 2018-09-19 | 1 | -0/+1 |
| * | | | | | | Update to use new timeout function everywhere. | Erik Johnston | 2018-09-19 | 4 | -72/+43 |
|/ / / / / / | |||||
* | | | | | | 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 | 2 | -4/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Changelog | Travis Ralston | 2018-09-18 | 1 | -0/+1 |
| * | | | | | | Destination is a string | Travis Ralston | 2018-09-18 | 1 | -4/+4 |
* | | | | | | | Remove documentation referencing Cygwin (#3873) | Amber Brown | 2018-09-19 | 3 | -31/+10 |
* | | | | | | | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_name | Amber Brown | 2018-09-19 | 2 | -3/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| * | | | | | | | Set SNI to the server_name, not whatever was in the SRV record | Richard van der Hoff | 2018-09-18 | 1 | -3/+10 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout | Amber Brown | 2018-09-19 | 2 | -1/+31 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | changelog | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
| * | | | | | | Bump timeout on get_missing_events request | Richard van der Hoff | 2018-09-18 | 1 | -1/+30 |
| |/ / / / / | |||||
* | | | | | | Use directory server for room joins (#3899) | Richard van der Hoff | 2018-09-18 | 2 | -0/+6 |
* | | | | | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 5 | -186/+359 |
* | | | | | | Merge pull request #3894 from matrix-org/hs/phone_home_py_version | Amber Brown | 2018-09-19 | 2 | -0/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Create 3894.feature | Will Hunt | 2018-09-17 | 1 | -0/+1 |
| * | | | | | typo | Will Hunt | 2018-09-17 | 1 | -1/+1 |
| * | | | | | make pip happy? | Will Hunt | 2018-09-17 | 1 | -2/+4 |
| * | | | | | Use a string for versions | Will Hunt | 2018-09-17 | 1 | -1/+1 |
| * | | | | | Add python_version phone home stat | Will Hunt | 2018-09-17 | 1 | -0/+2 |
* | | | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 2 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | changelog | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| * | | | | | | don't ratelimit autojoins | 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 | 3 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables. | Simon Dwyer | 2018-09-16 | 1 | -0/+1 |
| * | | | | | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable. | Simon Dwyer | 2018-09-16 | 1 | -1/+1 |
| * | | | | | | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable. | Simon Dwyer | 2018-09-16 | 1 | -0/+1 |
| * | | | | | | | Added 'MAX_UPLOAD_SIZE' variable and set default to "10M" | Simon Dwyer | 2018-09-16 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_alias | Richard van der Hoff | 2018-09-18 | 3 | -4/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | | | | | | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 2 | -4/+16 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metrics | Richard van der Hoff | 2018-09-18 | 3 | -12/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | | | | | | Fix more b'abcd' noise in metrics | Richard van der Hoff | 2018-09-17 | 2 | -12/+12 |
* | | | | | | | | Merge pull request #3897 from aaronraimist/synaspse-typo | Richard van der Hoff | 2018-09-18 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add changelog | Aaron Raimist | 2018-09-17 | 1 | -0/+1 |
| * | | | | | | | | Fix typo in README, synaspse -> synapse | Aaron Raimist | 2018-09-17 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | / / / / | Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logs | Richard van der Hoff | 2018-09-17 | 3 | -5/+9 |
|\| | | | | | | | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | | | | | Fix some b'abcd' noise in logs and metrics | Richard van der Hoff | 2018-09-17 | 2 | -5/+8 |
|/ / / / / / | |||||
* / / / / / | README: run python_dependencies with -m | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3888 from matrix-org/rav/nuke_nuke_rooms | Amber Brown | 2018-09-17 | 2 | -57/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | changelog | Richard van der Hoff | 2018-09-17 | 1 | -0/+1 |
| * | | | | Remove nuke-room-from-db.sh script | Richard van der Hoff | 2018-09-17 | 1 | -57/+0 |
|/ / / / | |||||
* | | | | missing changelog | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
* | | | | mention libjemalloc in readme (#3877) | Vincent Breitmoser | 2018-09-15 | 1 | -0/+8 |
* | | | | Fix timeout function | Erik Johnston | 2018-09-15 | 1 | -1/+2 |
* | | | | Merge pull request #3875 from matrix-org/erikj/extra_timeouts | Erik Johnston | 2018-09-14 | 3 | -0/+63 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| * | | | | Add an awful secondary timeout to fix wedged requests | Erik Johnston | 2018-09-14 | 2 | -0/+62 |
|/ / / / | |||||
* | | | | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 2 | -8/+1 |
* | | | | Merge pull request #3872 from matrix-org/hawkowl/timeouts-2 | Erik Johnston | 2018-09-14 | 5 | -7/+13 |
|\ \ \ \ | |||||
| * | | | | fix | Amber Brown | 2018-09-15 | 1 | -3/+3 |
| * | | | | changelog | Amber Brown | 2018-09-15 | 1 | -0/+1 |
| * | | | | fix | Amber Brown | 2018-09-14 | 1 | -1/+4 |
| * | | | | fix | Amber Brown | 2018-09-14 | 1 | -1/+1 |
| * | | | | redact better | Amber Brown | 2018-09-14 | 1 | -2/+2 |
| * | | | | we do that higher up | Amber Brown | 2018-09-14 | 1 | -0/+1 |
| * | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2 | Amber Brown | 2018-09-14 | 8 | -61/+55 |
| |\| | | | |||||
| * | | | | buffer? | Amber Brown | 2018-09-14 | 1 | -1/+2 |
* | | | | | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metrics | Erik Johnston | 2018-09-14 | 5 | -4/+217 |
|\ \ \ \ \ | |||||
| * | | | | | Remove spurious comment | Erik Johnston | 2018-09-14 | 1 | -2/+0 |
| * | | | | | Measure outbound requests | Erik Johnston | 2018-09-14 | 1 | -3/+6 |
| * | | | | | Newsfile | Erik Johnston | 2018-09-14 | 1 | -0/+1 |
| * | | | | | Tests | Erik Johnston | 2018-09-14 | 1 | -0/+81 |
| * | | | | | Add in flight real time metrics for Measure blocks | Erik Johnston | 2018-09-14 | 2 | -1/+131 |
|/ / / / / | |||||
* | | | | | Merge pull request #3860 from matrix-org/travis/typo-1 | Travis Ralston | 2018-09-13 | 2 | -1/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Create 3860.misc | Travis Ralston | 2018-09-13 | 1 | -0/+1 |
| * | | | | Fix minor typo in exception | Travis Ralston | 2018-09-13 | 1 | -1/+1 |
|/ / / / | |||||
* / / / | merge (#3576) | Amber Brown | 2018-09-14 | 8 | -61/+55 |
|/ / / | |||||
* | | | Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8 | Erik Johnston | 2018-09-13 | 2 | -16/+29 |
|\ \ \ | |||||
| * | | | comment | Erik Johnston | 2018-09-13 | 1 | -0/+2 |
| * | | | pep8 | Erik Johnston | 2018-09-13 | 1 | -1/+0 |
| * | | | Create indices after insertion | Erik Johnston | 2018-09-13 | 1 | -14/+18 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_p... | Erik Johnston | 2018-09-13 | 4 | -2/+28 |
| |\ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2018-09-13 | 1 | -0/+1 |
| * | | | | Make purge history slightly faster | Erik Johnston | 2018-09-13 | 1 | -2/+9 |
* | | | | | Merge pull request #3859 from matrix-org/erikj/add_iterkeys | Amber Brown | 2018-09-14 | 3 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-09-13 | 1 | -0/+1 |
| * | | | | | Fix handling of redacted events from federation | Erik Johnston | 2018-09-13 | 2 | -1/+6 |
* | | | | | | fix circleci merged builds (#3858) | Amber Brown | 2018-09-14 | 2 | -0/+5 |
|/ / / / / | |||||
* | / / / | Attempt to figure out what's going on with timeouts (#3857) | Amber Brown | 2018-09-14 | 4 | -57/+241 |
| |/ / / |/| | | | |||||
* | | | | Remove some superfluous logging (#3855) | Amber Brown | 2018-09-13 | 4 | -2/+28 |
|/ / / | |||||
* | | | Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7 | Neil Johnson | 2018-09-12 | 4 | -3/+60 |
|\ \ \ | |||||
| * | | | improve naming | Neil Johnson | 2018-09-12 | 4 | -10/+14 |
| * | | | towncrier | Neil Johnson | 2018-09-12 | 1 | -0/+1 |
| * | | | expose number of real reserved users | Neil Johnson | 2018-09-12 | 3 | -3/+55 |
* | | | | show heroes if a room has a 'deleted' name/canonical_alias (#3851) | Matthew Hodgson | 2018-09-12 | 2 | -2/+16 |
* | | | | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time | Erik Johnston | 2018-09-12 | 2 | -75/+75 |
|\ \ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| * | | | | Log outbound requests when we retry | Erik Johnston | 2018-09-12 | 1 | -75/+74 |
* | | | | | argh pep8 | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | | correctly log gappy sync metrics | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | | fix logline | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
* | | | | | Merge pull request #3841 from matrix-org/erikj/manhole_key_length | Erik Johnston | 2018-09-12 | 2 | -13/+32 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-09-11 | 1 | -0/+1 |
| * | | | | | Change the manhole SSH key to have more bits | Erik Johnston | 2018-09-11 | 1 | -13/+31 |
* | | | | | | Add JUnit summaries to CircleCI as well as merged runs (#3704) | Amber Brown | 2018-09-12 | 3 | -0/+94 |
* | | | | | | Port federation/ to py3 (#3847) | Amber Brown | 2018-09-12 | 4 | -19/+19 |
* | | | | | | Merge pull request #3835 from krombel/fix_3821 | Amber Brown | 2018-09-12 | 2 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add changelog | Krombel | 2018-09-10 | 1 | -0/+1 |
| * | | | | | | fix VOIP crashes under Python 3 (#3821) | Krombel | 2018-09-10 | 1 | -1/+5 |
* | | | | | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyring | Amber Brown | 2018-09-12 | 4 | -13/+47 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2018-09-07 | 1 | -0/+1 |
| * | | | | | | | clearer logging when things fail, too | Richard van der Hoff | 2018-09-06 | 2 | -7/+28 |
| * | | | | | | | add some logging for the keyring queue | Richard van der Hoff | 2018-09-06 | 1 | -6/+18 |
* | | | | | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_import | Amber Brown | 2018-09-12 | 3 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | changelog | Richard van der Hoff | 2018-09-07 | 1 | -0/+1 |
| * | | | | | | | | Fix jwt import check | Richard van der Hoff | 2018-09-07 | 2 | -1/+1 |
* | | | | | | | | | Port rest/ to Python 3 (#3823) | Amber Brown | 2018-09-12 | 18 | -100/+113 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Port crypto/ to Python 3 (#3822) | Amber Brown | 2018-09-12 | 4 | -6/+14 |
* | | | | | | | | Merge pull request #3845 from matrix-org/erikj/timeout_reads | Amber Brown | 2018-09-12 | 2 | -7/+46 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2018-09-12 | 1 | -0/+1 |
| * | | | | | | | Timeout reading body for outbound HTTP requests | Erik Johnston | 2018-09-12 | 1 | -7/+45 |
|/ / / / / / / | |||||
* | | | / / / | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 5 | -30/+159 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #3834 from mvgorcum/develop | Erik Johnston | 2018-09-10 | 2 | -10/+17 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | add runtime dependencies | Jan Christian Grünhage | 2018-09-10 | 1 | -5/+10 |
| * | | | | | Newsfile | Mathijs van Gorcum | 2018-09-10 | 1 | -0/+1 |
| * | | | | | Move COPY before RUN and merge RUNs | Mathijs van Gorcum | 2018-09-10 | 1 | -5/+5 |
| * | | | | | Remove build requirements after building | Mathijs van Gorcum | 2018-09-10 | 1 | -2/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join | Amber Brown | 2018-09-07 | 2 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Newsfile | Erik Johnston | 2018-09-06 | 1 | -0/+1 |
| * | | | | | Don't send empty tags list down sync | Erik Johnston | 2018-09-06 | 1 | -0/+5 |
| * | | | | | Send existing room tags down sync on join | Erik Johnston | 2018-09-06 | 1 | -0/+8 |
* | | | | | | Merge pull request #3783 from cwmke/develop | Richard van der Hoff | 2018-09-07 | 1 | -0/+12 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Remove end '/'s | Colin W | 2018-09-02 | 1 | -2/+2 |
| * | | | | | Update readme on develop branch | Colin W | 2018-09-02 | 1 | -0/+12 |
* | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-09-07 | 29 | -28/+61 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | changelog v0.33.4 github/release-v0.33.4 release-v0.33.4 | Amber Brown | 2018-09-07 | 2 | -1/+9 |
| * | | | | | version | Amber Brown | 2018-09-07 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into release-v0.33.4 v0.33.4rc2 | Erik Johnston | 2018-09-06 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| * | | | | | | Bump version and changelog | Erik Johnston | 2018-09-06 | 2 | -1/+7 |
| * | | | | | | Merge tag 'v0.33.3.1' into release-v0.33.4 | Erik Johnston | 2018-09-06 | 7 | -46/+158 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #3802 from matrix-org/jcgruenhage/docker-unignore-synctl | Amber Brown | 2018-09-06 | 2 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Create 3802.misc | Jan Christian Grünhage | 2018-09-06 | 1 | -0/+1 |
| | * | | | | | | | remove synctl from .dockerignore | Jan Christian Grünhage | 2018-09-06 | 1 | -1/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | version and towncrier v0.33.4rc1 | Amber Brown | 2018-09-04 | 29 | -28/+45 |
* | | | | | | | | Port tests/ to Python 3 (#3808) | Amber Brown | 2018-09-07 | 12 | -430/+349 |
* | | | | | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 5 | -6/+54 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | ensure guests never enter mau list | Neil Johnson | 2018-09-06 | 4 | -8/+10 |
| * | | | | | | | towncrier | Neil Johnson | 2018-09-05 | 1 | -0/+1 |
| * | | | | | | | guest users should not be part of mau total | Neil Johnson | 2018-09-05 | 2 | -3/+48 |
* | | | | | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus | Amber Brown | 2018-09-07 | 2 | -0/+13 |
|\ \ \ \ \ \ \ \ |