| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 8 | -25/+137 |
|\ |
|
| * | Fix typo and add description | Erik Johnston | 2019-03-21 | 1 | -1/+5 |
| * | Rejig testcase to make it more extensible | Erik Johnston | 2019-03-21 | 1 | -17/+22 |
| * | Remove debug | Erik Johnston | 2019-03-21 | 1 | -1/+0 |
| * | Add tests | Erik Johnston | 2019-03-21 | 1 | -1/+66 |
| * | Fix upsert | Erik Johnston | 2019-03-21 | 1 | -0/+1 |
| * | Revert spurious delete | Erik Johnston | 2019-03-20 | 1 | -0/+4 |
| * | comment block_room | Erik Johnston | 2019-03-20 | 1 | -0/+9 |
| * | Use flags | Erik Johnston | 2019-03-20 | 5 | -15/+17 |
| * | Move requester check into assert_accepted_privacy_policy | Erik Johnston | 2019-03-20 | 1 | -5/+8 |
| * | Newsfile | Erik Johnston | 2019-03-20 | 1 | -0/+1 |
| * | Gracefully handle failing to kick user | Erik Johnston | 2019-03-20 | 1 | -19/+27 |
| * | Log new room ID | Erik Johnston | 2019-03-20 | 1 | -1/+6 |
| * | Only require consent for events with an associated request | Erik Johnston | 2019-03-20 | 1 | -1/+5 |
| * | Allow blocking a room multiple times | Erik Johnston | 2019-03-20 | 1 | -2/+4 |
* | | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 7 | -3/+97 |
|\ \ |
|
| * | | Add test | Erik Johnston | 2019-03-20 | 2 | -3/+58 |
| * | | Disable publishing to room list when its disabled | Erik Johnston | 2019-03-20 | 1 | -0/+8 |
| * | | Pull out config option | Erik Johnston | 2019-03-20 | 1 | -3/+3 |
| * | | Return before we log | Erik Johnston | 2019-03-20 | 1 | -4/+5 |
| * | | Fix up config comments | Erik Johnston | 2019-03-20 | 2 | -6/+8 |
| * | | Newsfile | Erik Johnston | 2019-03-19 | 1 | -0/+1 |
| * | | Add option to disable search room lists | Erik Johnston | 2019-03-19 | 3 | -0/+27 |
* | | | Log requests which are simulated by the unit tests. (#4905) | Richard van der Hoff | 2019-03-20 | 2 | -8/+2 |
* | | | Merge pull request #4895 from matrix-org/erikj/disable_user_search | Erik Johnston | 2019-03-20 | 5 | -0/+73 |
|\ \ \
| |_|/
|/| | |
|
| * | | Add test | Erik Johnston | 2019-03-20 | 1 | -0/+52 |
| * | | Fix up sample config | Erik Johnston | 2019-03-20 | 2 | -4/+8 |
| * | | Update synapse/config/user_directory.py | Richard van der Hoff | 2019-03-20 | 1 | -1/+1 |
| * | | Update sample config | Erik Johnston | 2019-03-19 | 1 | -0/+3 |
| * | | Newsfile | Erik Johnston | 2019-03-19 | 1 | -0/+1 |
| * | | Add option to disable searching in the user dir | Erik Johnston | 2019-03-19 | 2 | -0/+13 |
| |/ |
|
* | | Batching in the user directory import (#4900) | Amber Brown | 2019-03-21 | 2 | -0/+14 |
* | | Add a config option for torture-testing worker replication. (#4902) | Richard van der Hoff | 2019-03-20 | 3 | -1/+23 |
* | | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 7 | -22/+308 |
|/ |
|
* | Merge pull request #4894 from matrix-org/erikj/postgres_tuning | Erik Johnston | 2019-03-19 | 2 | -2/+21 |
|\ |
|
| * | Newsfile | Erik Johnston | 2019-03-19 | 1 | -0/+1 |
| * | Add note on tuning postgres | Erik Johnston | 2019-03-19 | 1 | -2/+20 |
|/ |
|
* | Merge pull request #4879 from matrix-org/erikj/test_old_deps | Erik Johnston | 2019-03-19 | 3 | -1/+21 |
|\ |
|
| * | Add comment back in | Erik Johnston | 2019-03-19 | 1 | -0/+1 |
| * | Update newsfile | Erik Johnston | 2019-03-19 | 1 | -1/+1 |
| * | Revert changes | Erik Johnston | 2019-03-19 | 1 | -12/+2 |
| * | Bring py27-old into line with other test envs | Erik Johnston | 2019-03-18 | 1 | -0/+14 |
| * | Add coverage to py27-old | Erik Johnston | 2019-03-18 | 1 | -3/+6 |
| * | Newsfile | Erik Johnston | 2019-03-18 | 1 | -0/+1 |
| * | Add py27-old test case to buildkite | Erik Johnston | 2019-03-18 | 1 | -0/+11 |
* | | Merge pull request #4889 from matrix-org/rav/test_real_config | Richard van der Hoff | 2019-03-19 | 8 | -18/+44 |
|\ \ |
|
| * | | Fix RegistrationTestCase | Richard van der Hoff | 2019-03-19 | 1 | -2/+9 |
| * | | changelog | Richard van der Hoff | 2019-03-19 | 1 | -0/+1 |
| * | | Use a regular HomeServerConfig object for unit tests | Richard van der Hoff | 2019-03-19 | 3 | -13/+25 |
| * | | Fix resource limits tests | Richard van der Hoff | 2019-03-19 | 1 | -2/+5 |
| * | | Fix registration test | Richard van der Hoff | 2019-03-19 | 1 | -1/+2 |
| * | | Fix email test | Richard van der Hoff | 2019-03-19 | 1 | -0/+2 |
| * | | Merge remote-tracking branch 'origin/develop' into HEAD | Richard van der Hoff | 2019-03-19 | 10 | -11/+45 |
| |\ \ |
|
* | | | | Merge pull request #4888 from matrix-org/rav/fix_disabled_hs | Richard van der Hoff | 2019-03-19 | 3 | -3/+24 |
|\| | |
| |/ /
|/| | |
|
| * | | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 3 | -3/+24 |
* | | | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 5 | -5/+39 |
* | | | Fix user directory background update (#4887) | Erik Johnston | 2019-03-19 | 2 | -1/+2 |
* | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-03-19 | 3 | -5/+4 |
|\ \ \
| |/ /
|/| | |
|
| * | | Repoint docs for federation (#4881) | Michael Kaye | 2019-03-19 | 2 | -1/+2 |
| * | | fix some typos in federate.md | Richard van der Hoff | 2019-03-15 | 1 | -4/+2 |
* | | | Comment out most options in the generated config. (#4863) | Richard van der Hoff | 2019-03-19 | 16 | -171/+230 |
* | | | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 8 | -301/+405 |
* | | | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 6 | -5/+86 |
| |/
|/| |
|
* | | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 11 | -37/+259 |
* | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queue | Richard van der Hoff | 2019-03-15 | 8 | -761/+865 |
|\ \ |
|
| * | | changelog | Richard van der Hoff | 2019-03-13 | 1 | -0/+1 |
| * | | Rename and move the classes | Richard van der Hoff | 2019-03-13 | 7 | -811/+864 |
| * | | Factor per-destination stuff out of TransactionQueue | Richard van der Hoff | 2019-03-13 | 1 | -132/+182 |
* | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker | Richard van der Hoff | 2019-03-15 | 6 | -55/+111 |
|\| | |
|
| * | | changelog | Richard van der Hoff | 2019-03-13 | 1 | -0/+1 |
| * | | Move client receipt processing to federation sender worker. | Richard van der Hoff | 2019-03-13 | 4 | -33/+78 |
| * | | declare a ReadReceipt class | Richard van der Hoff | 2019-03-13 | 2 | -24/+34 |
* | | | Merge pull request #4853 from matrix-org/erikj/worker_docker_ci | Erik Johnston | 2019-03-15 | 5 | -17/+54 |
|\ \ \ |
|
| * | | | Correctly handle all command line options | Erik Johnston | 2019-03-14 | 3 | -16/+42 |
| * | | | Newsfile | Erik Johnston | 2019-03-13 | 1 | -0/+1 |
| * | | | Allow passing --daemonize to workers | Erik Johnston | 2019-03-13 | 2 | -1/+11 |
* | | | | Add systemd setup that supports workers (#4662) | Luca Corbatto | 2019-03-15 | 6 | -0/+205 |
* | | | | Add some stuff back to the .gitignore (#4843) | Aaron Raimist | 2019-03-15 | 2 | -3/+8 |
* | | | | Merge pull request #4859 from matrix-org/revert-4793-anoa/trailing_slashes | Erik Johnston | 2019-03-14 | 4 | -12/+11 |
|\ \ \ \ |
|
| * | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ... | Erik Johnston | 2019-03-14 | 4 | -12/+11 |
|/ / / / |
|
* | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 11 | -138/+206 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | fixup | Amber Brown | 2019-03-13 | 2 | -2/+2 |
| * | | | fixup | Amber Brown | 2019-03-13 | 4 | -75/+17 |
| * | | | fixup | Amber Brown | 2019-03-12 | 1 | -2/+2 |
| * | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+1 |
| * | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+2 |
| * | | | fixup | Amber Brown | 2019-03-12 | 4 | -176/+159 |
| * | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+1 |
| * | | | use the old method | Amber Brown | 2019-03-12 | 1 | -3/+2 |
| * | | | fix | Amber Brown | 2019-03-12 | 1 | -1/+1 |
| * | | | pep8 | Amber Brown | 2019-03-12 | 1 | -2/+1 |
| * | | | changelog | Amber Brown | 2019-03-12 | 1 | -0/+1 |
| * | | | fixes | Amber Brown | 2019-03-12 | 4 | -52/+74 |
| * | | | setup master | Amber Brown | 2019-03-11 | 1 | -0/+2 |
| * | | | master startup | Amber Brown | 2019-03-11 | 2 | -0/+9 |
| * | | | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search | Amber Brown | 2019-03-11 | 8 | -19/+57 |
| |\ \ \ |
|
| * | | | | initial | Amber Brown | 2019-03-11 | 5 | -4/+114 |
* | | | | | Document using a certificate with a full chain (#4849) | Andrew Morgan | 2019-03-13 | 4 | -2/+17 |
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Neil Johnson | 2019-03-12 | 5 | -154/+207 |
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | fix orphaned sentence | Neil Johnson | 2019-03-12 | 1 | -1/+0 |
| * | | | Neilj/improved delegation doc 2 (#4832) | Neil Johnson | 2019-03-12 | 4 | -148/+202 |
| * | | | Add zwsp in bug report template (#4811) | Richard van der Hoff | 2019-03-06 | 1 | -6/+6 |
* | | | | Transfer local user's push rules on room upgrade (#4838) | Andrew Morgan | 2019-03-12 | 3 | -0/+62 |
* | | | | Clarify what registration_shared_secret allows for (#2885) (#4844) | Aaron Raimist | 2019-03-11 | 4 | -6/+7 |
* | | | | Make federation endpoints more tolerant of trailing slashes for some endpoint... | Andrew Morgan | 2019-03-11 | 4 | -11/+12 |
* | | | | Merge pull request #4847 from matrix-org/erikj/fix_stacktrace_keyring | Erik Johnston | 2019-03-11 | 2 | -2/+3 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Newsfile | Erik Johnston | 2019-03-11 | 1 | -0/+1 |
| * | | | Correctly log expected errors when fetching server keys | Erik Johnston | 2019-03-11 | 1 | -2/+2 |
|/ / / |
|
* | | | Merge pull request #4839 from matrix-org/anoa/no_captcha_tests | Andrew Morgan | 2019-03-11 | 2 | -0/+2 |
|\ \ \ |
|
| * | | | Add changelog | Andrew Morgan | 2019-03-08 | 1 | -0/+1 |
| * | | | Disable captcha registration by default in tests | Andrew Morgan | 2019-03-08 | 1 | -0/+1 |
| | |/
| |/| |
|
* | | | fix incorrect encoding of filenames with spaces in (#2090) | Matthew Hodgson | 2019-03-11 | 2 | -3/+52 |
* | | | Merge pull request #4837 from matrix-org/erikj/optional_prev_state | Erik Johnston | 2019-03-11 | 4 | -16/+3 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add comment to schema | Erik Johnston | 2019-03-08 | 1 | -0/+2 |
| * | | Newsfile | Erik Johnston | 2019-03-08 | 1 | -0/+1 |
| * | | Make `prev_state` field optional | Erik Johnston | 2019-03-08 | 2 | -16/+0 |
|/ / |
|
* | | Merge pull request #4814 from matrix-org/erikj/soft_fail_impl | Erik Johnston | 2019-03-08 | 5 | -1/+113 |
|\ \ |
|
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_... | Erik Johnston | 2019-03-08 | 40 | -503/+711 |
| |\ \
| |/ /
|/| | |
|
* | | | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates | Erik Johnston | 2019-03-08 | 2 | -3/+8 |
|\ \ \ |
|
| * | | | Newsfile | Erik Johnston | 2019-03-07 | 1 | -0/+1 |
| * | | | When re-syncing device lists reset the state | Erik Johnston | 2019-03-07 | 1 | -3/+7 |
* | | | | Merge pull request #4828 from matrix-org/erikj/debug_device_lists | Erik Johnston | 2019-03-07 | 2 | -2/+39 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Newsfile | Erik Johnston | 2019-03-07 | 1 | -0/+1 |
| * | | | Add some debug logging for device list handling | Erik Johnston | 2019-03-07 | 1 | -2/+38 |
|/ / / |
|
* | | | Merge pull request #4824 from matrix-org/rav/docker_docs | Richard van der Hoff | 2019-03-07 | 2 | -4/+38 |
|\ \ \ |
|
| * | | | Document the `generate` option for the docker image. | Richard van der Hoff | 2019-03-07 | 2 | -4/+38 |
* | | | | Debian package: fix warning during preconfiguration. (#4823) | Richard van der Hoff | 2019-03-07 | 2 | -1/+11 |
|\ \ \ \ |
|
| * | | | | Debian package: fix warning during preconfiguration. | Richard van der Hoff | 2019-03-07 | 2 | -1/+11 |
| |/ / / |
|
* | | | | Update example_log_config.yaml (#4820) | Richard van der Hoff | 2019-03-07 | 2 | -1/+3 |
* | | | | Fix check-newsfragment for debian-only changes. (#4825) | Richard van der Hoff | 2019-03-07 | 2 | -7/+6 |
* | | | | Rewrite userdir to be faster (#4537) | Amber Brown | 2019-03-07 | 6 | -409/+400 |
* | | | | Reword the sample config header to be less scary (#4801) | Matthew Hodgson | 2019-03-07 | 3 | -10/+21 |
|/ / / |
|
* | | | Merge pull request #4779 from matrix-org/travis/icons | Travis Ralston | 2019-03-06 | 4 | -7/+8 |
|\ \ \ |
|
| * | | | Update changelog.d/4779.misc | Richard van der Hoff | 2019-03-06 | 1 | -1/+1 |
| * | | | Changelog | Travis Ralston | 2019-03-01 | 1 | -0/+1 |
| * | | | Use static locations for Riot icons | Travis Ralston | 2019-03-01 | 3 | -7/+7 |
* | | | | Merge pull request #4818 from matrix-org/erikj/prefill_client_ips | Erik Johnston | 2019-03-06 | 2 | -0/+3 |
|\ \ \ \ |
|
| * | | | | Update changelog | Erik Johnston | 2019-03-06 | 2 | -1/+1 |
| * | | | | Newsfile | Erik Johnston | 2019-03-06 | 1 | -0/+1 |
| * | | | | Prefill client IPs cache on workers | Erik Johnston | 2019-03-06 | 1 | -0/+2 |
* | | | | | Merge pull request #4815 from matrix-org/erikj/docstrings | Erik Johnston | 2019-03-06 | 3 | -7/+46 |
|\ \ \ \ \ |
|
| * | | | | | Newsfile | Erik Johnston | 2019-03-06 | 1 | -0/+1 |
| * | | | | | Add docstrings from matrix-org-hotfixes | Erik Johnston | 2019-03-06 | 2 | -7/+45 |
| |/ / / / |
|
* | | | | | Merge pull request #4816 from matrix-org/erikj/4422_debug | Erik Johnston | 2019-03-06 | 2 | -7/+47 |
|\ \ \ \ \ |
|
| * | | | | | Newsfile | Erik Johnston | 2019-03-06 | 1 | -0/+1 |
| * | | | | | Port #4422 debug logging from hotfixes | Erik Johnston | 2019-03-06 | 1 | -7/+46 |
| |/ / / / |
|
* | | | | | Merge pull request #4817 from matrix-org/erikj/shutdown_room_message | Erik Johnston | 2019-03-06 | 2 | -11/+12 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Newsfile | Erik Johnston | 2019-03-06 | 1 | -0/+1 |
| * | | | | Send message after room has been shutdown | Erik Johnston | 2019-03-06 | 1 | -11/+11 |
|/ / / / |
|
* | | | | Merge pull request #4792 from matrix-org/anoa/replication_tokens | Andrew Morgan | 2019-03-06 | 2 | -3/+29 |
|\ \ \ \ |
|
| * | | | | Simplify token replication logic | Andrew Morgan | 2019-03-05 | 1 | -23/+14 |
| * | | | | Clean up logic and add comments | Andrew Morgan | 2019-03-04 | 1 | -11/+18 |
| * | | | | Clearer branching, fix missing list clear | Andrew Morgan | 2019-03-04 | 1 | -4/+11 |
| * | | | | Add changelog | Andrew Morgan | 2019-03-04 | 1 | -0/+1 |
| * | | | | Prevent replication wedging | Andrew Morgan | 2019-03-04 | 1 | -4/+24 |
* | | | | | Merge pull request #4804 from matrix-org/babolivier/ratelimit_registration_im... | Brendan Abolivier | 2019-03-06 | 7 | -31/+40 |
|\ \ \ \ \ |
|
| * | | | | | Make registration ratelimiter separate from the main events one | Brendan Abolivier | 2019-03-06 | 3 | -2/+6 |
| * | | | | | Revert "Split ratelimiters in two (one for events, one for registration)" | Brendan Abolivier | 2019-03-06 | 9 | -15/+11 |
| * | | | | | Add changelog | Brendan Abolivier | 2019-03-05 | 1 | -0/+1 |
| * | | | | | Split ratelimiters in two (one for events, one for registration) | Brendan Abolivier | 2019-03-05 | 9 | -11/+15 |
| * | | | | | Update sample config | Brendan Abolivier | 2019-03-05 | 1 | -11/+13 |
| * | | | | | Move settings from registration to ratelimiting in config file | Brendan Abolivier | 2019-03-05 | 2 | -18/+20 |
|/ / / / / |
|
| | | * | | Factor out soft fail checks | Erik Johnston | 2019-03-08 | 1 | -5/+22 |
| | | * | | Newsfile | Erik Johnston | 2019-03-06 | 1 | -0/+1 |
| | | * | | Implement soft fail | Erik Johnston | 2019-03-06 | 4 | -1/+95 |
| |_|/ /
|/| | | |
|
* | | | | Merge pull request #4772 from jbweston/jbweston/server-version-api | Erik Johnston | 2019-03-05 | 5 | -2/+85 |
|\ \ \ \ |
|
| * | | | | add API documentation | Joseph Weston | 2019-03-02 | 1 | -0/+22 |
| * | | | | Add changelog and AUTHORS file entry | Joseph Weston | 2019-03-01 | 2 | -0/+4 |
| * | | | | Add 'server_version' endpoint to admin API | Joseph Weston | 2019-03-01 | 2 | -1/+58 |
| * | | | | Import 'admin' module rather than 'register_servlets' directly | Joseph Weston | 2019-03-01 | 1 | -2/+2 |
* | | | | | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 17 | -54/+186 |
* | | | | | Merge pull request #4795 from matrix-org/anoa/configinatoractoring | Andrew Morgan | 2019-03-05 | 2 | -3/+4 |
|\ \ \ \ \ |
|
| * | | | | | Add changelog | Andrew Morgan | 2019-03-04 | 1 | -0/+1 |
| * | | | | | Remove reference to that no longer exists in README | Andrew Morgan | 2019-03-04 | 1 | -3/+3 |
* | | | | | | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahs | Andrew Morgan | 2019-03-05 | 2 | -22/+23 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add changelog | Andrew Morgan | 2019-03-04 | 1 | -0/+1 |
| * | | | | | | Remove unnecessary dollar signs | Andrew Morgan | 2019-03-04 | 1 | -22/+22 |
| |/ / / / / |
|
* | | | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_room | Erik Johnston | 2019-03-05 | 4 | -29/+127 |
|\ \ \ \ \ \ |
|
| * | | | | | | clarify comments | Erik Johnston | 2019-03-05 | 3 | -10/+13 |
| * | | | | | | Fix missing null guard | Erik Johnston | 2019-03-04 | 1 | -1/+1 |
| * | | | | | | Only check history visibility when filtering | Erik Johnston | 2019-03-04 | 2 | -35/+46 |
| * | | | | | | s/get_forward_events/get_successor_events/ | Erik Johnston | 2019-03-04 | 2 | -3/+3 |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n... | Erik Johnston | 2019-03-04 | 101 | -535/+1462 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Update newsfile to have a full stop | Erik Johnston | 2019-02-27 | 1 | -1/+1 |
| * | | | | | | | Update comments | Erik Johnston | 2019-02-27 | 1 | -3/+13 |
| * | | | | | | | Newsfile | Erik Johnston | 2019-02-20 | 1 | -0/+1 |
| * | | | | | | | Stop backpaginating when events not visible | Erik Johnston | 2019-02-20 | 3 | -5/+78 |
* | | | | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_code | Erik Johnston | 2019-03-05 | 2 | -60/+6 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | changelog | Richard van der Hoff | 2019-03-04 | 1 | -0/+1 |
| * | | | | | | | | Remove redundant PreserveLoggingContext | Richard van der Hoff | 2019-03-04 | 1 | -10/+5 |
| * | | | | | | | | Remove unused `wait_for_replication` method | Richard van der Hoff | 2019-03-04 | 1 | -50/+0 |
* | | | | | | | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keys | Erik Johnston | 2019-03-05 | 11 | -747/+765 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-03-04 | 1 | -0/+1 |
| * | | | | | | | | | Allow /keys/{changes,query} API to run on worker | Erik Johnston | 2019-03-04 | 3 | -2/+15 |
| * | | | | | | | | | Split DeviceHandler into master and worker | Erik Johnston | 2019-03-04 | 2 | -170/+179 |
| * | | | | | | | | | Fixup slave stores | Erik Johnston | 2019-03-04 | 6 | -577/+572 |
| | |_|_|/ / / / /
| |/| | | | | | | |
|
* | | | | | | | | | Merge pull request #4798 from matrix-org/rav/rr_debug | Richard van der Hoff | 2019-03-04 | 2 | -6/+21 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Add some debug about processing read receipts. | Richard van der Hoff | 2019-03-04 | 2 | -6/+21 |
* | | | | | | | | | | Merge pull request #4797 from matrix-org/rav/inline_rr_send | Richard van der Hoff | 2019-03-04 | 2 | -59/+45 |
|\| | | | | | | | |
| |_|/ / / / / / /
|/| | | | | | | | |
|
| * | | | | | | | | Clean up read-receipt handling. | Richard van der Hoff | 2019-03-04 | 2 | -59/+45 |
|/ / / / / / / / |
|
* / / / / / / / | Include a default configuration file in the 'docs' directory. (#4791) | Richard van der Hoff | 2019-03-04 | 11 | -13/+1114 |
|/ / / / / / / |
|
* | | | | | | | Fix v4v6 option in HAProxy example config (#4790) | Seebi | 2019-03-04 | 2 | -7/+6 |
* | | | | | | | Avoid rebuilding Edu objects in worker mode (#4770) | Richard van der Hoff | 2019-03-04 | 6 | -19/+37 |
| |/ / / / /
|/| | | | | |
|
* | | | | | | Update test_typing to use HomeserverTestCase. (#4771) | Richard van der Hoff | 2019-03-04 | 5 | -179/+176 |
| |_|_|/ /
|/| | | | |
|
* | | | | | Fix incorrect log about not persisting duplicate state event. (#4776) | Richard van der Hoff | 2019-03-01 | 2 | -3/+5 |
| |_|/ /
|/| | | |
|
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-03-01 | 3 | -6/+6 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | 0.99.2 v0.99.2 github/release-v0.99.2 release-v0.99.2 | Richard van der Hoff | 2019-03-01 | 1 | -6/+0 |
| * | | 0.99.2 | Richard van der Hoff | 2019-03-01 | 3 | -4/+10 |
* | | | Minor docstring fixes for MatrixFederationAgent (#4765) | Andrew Morgan | 2019-02-28 | 2 | -1/+6 |
* | | | Make 'event_id' a required parameter in federated state requests (#4741) | Amber Brown | 2019-02-27 | 2 | -2/+3 |
* | | | Fix parsing of Content-Disposition headers (#4763) | Richard van der Hoff | 2019-02-27 | 3 | -20/+111 |
* | | | Move from TravisCI to BuildKite (#4752) | Amber Brown | 2019-02-27 | 13 | -108/+325 |
* | | | Merge pull request #4759 from matrix-org/erikj/3pid_client_reader | Erik Johnston | 2019-02-27 | 4 | -33/+37 |
|\ \ \ |
|
| * | | | Update changelog.d/4759.feature | Richard van der Hoff | 2019-02-27 | 1 | -1/+1 |
| * | | | Newsfile | Erik Johnston | 2019-02-27 | 1 | -0/+1 |
| * | | | Move /account/3pid to client_reader | Erik Johnston | 2019-02-27 | 3 | -33/+36 |
* | | | | Merge pull request #4758 from matrix-org/erikj/use_presence_replication | Erik Johnston | 2019-02-27 | 3 | -2/+9 |
|\ \ \ \ |
|
| * | | | | Newsfile | Erik Johnston | 2019-02-27 | 1 | -0/+1 |
| * | | | | When presence is enabled don't send over replication | Erik Johnston | 2019-02-27 | 2 | -2/+8 |
| |/ / / |
|
* | | | | Merge pull request #4757 from matrix-org/erikj/key_api_fed_readae | Erik Johnston | 2019-02-27 | 4 | -1/+13 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Fix unit tests | Erik Johnston | 2019-02-27 | 1 | -0/+6 |
| * | | | Newsfile | Erik Johnston | 2019-02-27 | 1 | -0/+1 |
| * | | | Move server key queries to federation reader | Erik Johnston | 2019-02-27 | 2 | -1/+6 |
|/ / / |
|
* | | | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoff | Erik Johnston | 2019-02-27 | 5 | -6/+43 |
|\ \ \
| |/ /
|/| | |
|
| * | | Move connecting logic into ClientReplicationStreamProtocol | Erik Johnston | 2019-02-27 | 2 | -18/+17 |
| * | | Newsfile | Erik Johnston | 2019-02-26 | 1 | -0/+1 |
| * | | Increase the max delay between retry attempts | Erik Johnston | 2019-02-26 | 1 | -1/+1 |
| * | | Fix tightloop over connecting to replication server | Erik Johnston | 2019-02-26 | 3 | -5/+42 |
* | | | 0.99.2rc1 v0.99.2rc1 | Richard van der Hoff | 2019-02-27 | 50 | -53/+63 |
* | | | Limit cache invalidation replication line length (#4748) | Erik Johnston | 2019-02-27 | 3 | -5/+28 |
* | | | Add database version to phonehome stats. (#4753) | Richard van der Hoff | 2019-02-27 | 5 | -0/+46 |
* | | | Fix check-newsfragment script (#4750) | Richard van der Hoff | 2019-02-26 | 3 | -4/+10 |
* | | | Fix apache reverse proxy example (#4742) | Paul Tötterman | 2019-02-26 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #4746 from matrix-org/anoa/public_rooms_federate_develop | Andrew Morgan | 2019-02-26 | 4 | -13/+65 |
|\ \ |
|
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room... | Andrew Morgan | 2019-02-26 | 391 | -6363/+18845 |
| |\ \
| |/ /
|/| | |
|
* | | | Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federate | Andrew Morgan | 2019-02-26 | 4 | -70/+17 |
|\ \ \ |
|
| * | | | Revert "Prevent showing non-fed rooms in fed /publicRooms" | Andrew Morgan | 2019-02-26 | 4 | -70/+17 |
|/ / / |
|
* | | | Merge pull request #4736 from matrix-org/anoa/public_rooms_federate | Andrew Morgan | 2019-02-26 | 4 | -17/+70 |
|\ \ \ |
|
| * | | | Cleaner chunk logic | Andrew Morgan | 2019-02-26 | 1 | -5/+4 |
| * | | | Correct indent | Andrew Morgan | 2019-02-26 | 1 | -3/+3 |
| * | | | Correct docstring types and chunk logic | Andrew Morgan | 2019-02-26 | 1 | -10/+11 |
| * | | | Clean up room chunk logic | Andrew Morgan | 2019-02-26 | 1 | -6/+8 |
| * | | | Make not showing non-federated rooms the default | Andrew Morgan | 2019-02-26 | 2 | -13/+1 |
| * | | | Result may be None | Andrew Morgan | 2019-02-26 | 1 | -1/+1 |
| * | | | Address rich comments | Andrew Morgan | 2019-02-26 | 2 | -7/+31 |
| * | | | Fix group's call to generate_room_entry | Andrew Morgan | 2019-02-25 | 1 | -4/+2 |
| * | | | elif not else if | Andrew Morgan | 2019-02-25 | 1 | -1/+1 |
| * | | | syntax derp | Andrew Morgan | 2019-02-25 | 1 | -1/+1 |
| * | | | Simplify call to generate_room_entry | Andrew Morgan | 2019-02-25 | 1 | -17/+13 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room... | Erik Johnston | 2019-02-25 | 384 | -6331/+18693 |
| |\ \ \ |
|