Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Review comments | Erik Johnston | 2019-03-28 | 1 | -44/+62 |
| | |||||
* | Use event streams to calculate presence | Erik Johnston | 2019-03-27 | 1 | -29/+130 |
| | | | | | | | | | | | | | | | | | Primarily this fixes a bug in the handling of remote users joining a room where the server sent out the presence for all local users in the room to all servers in the room. We also change to using the state delta stream, rather than the distributor, as it will make it easier to split processing out of the master process (as well as being more flexible). Finally, when sending presence states to newly joined servers we filter out old presence states to reduce the number sent. Initially we filter out states that are offline and have a last active more than a week ago, though this can be changed down the line. Fixes #3962 | ||||
* | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 3 | -8/+51 |
| | | | | | Adds a new method, check_3pid_auth, which gives password providers the chance to allow authentication with third-party identifiers such as email or msisdn. | ||||
* | Refactor out state delta handling into its own class (#4917) | Amber Brown | 2019-03-25 | 2 | -46/+75 |
| | |||||
* | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms | Erik Johnston | 2019-03-21 | 2 | -2/+11 |
|\ | | | | | Deny peeking into rooms that have been blocked | ||||
| * | Deny peeking into rooms that have been blocked | Erik Johnston | 2019-03-21 | 2 | -2/+11 |
| | | |||||
* | | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 4 | -2/+13 |
|\| | | | | | Fixup shutdown room API | ||||
| * | Revert spurious delete | Erik Johnston | 2019-03-20 | 1 | -0/+4 |
| | | |||||
| * | Use flags | Erik Johnston | 2019-03-20 | 4 | -13/+13 |
| | | |||||
| * | Move requester check into assert_accepted_privacy_policy | Erik Johnston | 2019-03-20 | 1 | -5/+8 |
| | | |||||
| * | Only require consent for events with an associated request | Erik Johnston | 2019-03-20 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | There are a number of instances where a server or admin may puppet a user to join/leave rooms, which we don't want to fail if the user has not consented to the privacy policy. We fix this by adding a check to test if the requester has an associated access_token, which is used as a proxy to answer the question of whether the action is being done on behalf of a real request from the user. | ||||
* | | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 2 | -0/+22 |
|\ \ | |/ |/| | Add option to disable search room lists | ||||
| * | 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 |
| | | |||||
| * | Add option to disable search room lists | Erik Johnston | 2019-03-19 | 1 | -0/+13 |
| | | | | | | | | This disables both local and remote room list searching. | ||||
* | | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 1 | -1/+1 |
|/ | | | | Rate-limit outgoing read-receipts as per #4730. | ||||
* | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 2 | -3/+15 |
| | |||||
* | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 1 | -160/+13 |
| | |||||
* | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 1 | -5/+23 |
| | |||||
* | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 2 | -2/+38 |
| | | | Add two ratelimiters on login (per-IP address and per-userID). | ||||
* | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker | Richard van der Hoff | 2019-03-15 | 1 | -55/+24 |
|\ | | | | | Move client receipt processing to federation sender worker. | ||||
| * | Move client receipt processing to federation sender worker. | Richard van der Hoff | 2019-03-13 | 1 | -33/+4 |
| | | | | | | | | | | This is mostly a prerequisite for #4730, but also fits with the general theme of "move everything off the master that we possibly can". | ||||
| * | declare a ReadReceipt class | Richard van der Hoff | 2019-03-13 | 1 | -24/+22 |
| | | | | | | | | | | I'm going to use this in queues and things, so it'll be useful to give it more of a structure. | ||||
* | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 1 | -48/+77 |
|\ \ | |/ |/| | Improve searching in the userdir | ||||
| * | fixup | Amber Brown | 2019-03-13 | 1 | -1/+1 |
| | | |||||
| * | fixup | Amber Brown | 2019-03-12 | 1 | -47/+70 |
| | | |||||
| * | fixes | Amber Brown | 2019-03-12 | 1 | -39/+6 |
| | | |||||
| * | initial | Amber Brown | 2019-03-11 | 1 | -1/+40 |
| | | |||||
* | | Transfer local user's push rules on room upgrade (#4838) | Andrew Morgan | 2019-03-12 | 1 | -0/+4 |
|/ | | | Transfer push rules (notifications) on room upgrade | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-03-08 | 4 | -205/+155 |
|\ | | | | | | | erikj/soft_fail_impl | ||||
| * | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates | Erik Johnston | 2019-03-08 | 1 | -3/+7 |
| |\ | | | | | | | When re-syncing device lists reset the state | ||||
| | * | When re-syncing device lists reset the state | Erik Johnston | 2019-03-07 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | We keep track of what stream IDs we've seen so that we know what updates we've handled or missed. If we re-sync we don't know if the updates we've seen are included in the re-sync (there may be a race), so we should reset the seen updates. | ||||
| * | | Add some debug logging for device list handling | Erik Johnston | 2019-03-07 | 1 | -2/+38 |
| |/ | |||||
| * | Rewrite userdir to be faster (#4537) | Amber Brown | 2019-03-07 | 1 | -185/+37 |
| | | |||||
| * | Merge pull request #4815 from matrix-org/erikj/docstrings | Erik Johnston | 2019-03-06 | 1 | -7/+26 |
| |\ | | | | | | | Add docstrings from matrix-org-hotfixes | ||||
| | * | Add docstrings from matrix-org-hotfixes | Erik Johnston | 2019-03-06 | 1 | -7/+26 |
| | | | |||||
| * | | Port #4422 debug logging from hotfixes | Erik Johnston | 2019-03-06 | 1 | -7/+46 |
| |/ | |||||
| * | Make registration ratelimiter separate from the main events one | Brendan Abolivier | 2019-03-06 | 1 | -1/+1 |
| | | |||||
| * | Revert "Split ratelimiters in two (one for events, one for registration)" | Brendan Abolivier | 2019-03-06 | 3 | -3/+3 |
| | | | | | | | | This reverts commit d7dbad3526136cfc9fdbd568635be5016fb637db. | ||||
| * | Split ratelimiters in two (one for events, one for registration) | Brendan Abolivier | 2019-03-05 | 3 | -3/+3 |
| | | |||||
* | | Factor out soft fail checks | Erik Johnston | 2019-03-08 | 1 | -5/+22 |
| | | |||||
* | | Implement soft fail | Erik Johnston | 2019-03-06 | 1 | -1/+76 |
|/ | |||||
* | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 2 | -10/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test | ||||
* | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_room | Erik Johnston | 2019-03-05 | 1 | -0/+46 |
|\ | | | | | Stop backpaginating when events not visible | ||||
| * | clarify comments | Erik Johnston | 2019-03-05 | 1 | -8/+11 |
| | | |||||
| * | Only check history visibility when filtering | Erik Johnston | 2019-03-04 | 1 | -1/+3 |
| | | | | | | | | | | | | When filtering events to send to server we check more than just history visibility. However when deciding whether to backfill or not we only care about the history visibility. | ||||
| * | s/get_forward_events/get_successor_events/ | Erik Johnston | 2019-03-04 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-03-04 | 6 | -52/+137 |
| |\ | | | | | | | | | | erikj/stop_fed_not_in_room | ||||
| * | | Update comments | Erik Johnston | 2019-02-27 | 1 | -3/+13 |
| | | | |||||
| * | | Stop backpaginating when events not visible | Erik Johnston | 2019-02-20 | 1 | -0/+31 |
| | | | |||||
* | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keys | Erik Johnston | 2019-03-05 | 1 | -168/+174 |
|\ \ \ | | | | | | | | | Allow /keys/{changes,query} API to run on worker | ||||
| * | | | Allow /keys/{changes,query} API to run on worker | Erik Johnston | 2019-03-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Split DeviceHandler into master and worker | Erik Johnston | 2019-03-04 | 1 | -168/+174 |
| | | | | |||||
* | | | | Clean up read-receipt handling. | Richard van der Hoff | 2019-03-04 | 1 | -59/+44 |
|/ / / | | | | | | | | | | | | | | | | | | | Remove a call to run_as_background_process: there is no need to run this as a background process, because build_and_send_edu does not block. We may as well inline the whole of _push_remotes. | ||||
* | / | Avoid rebuilding Edu objects in worker mode (#4770) | Richard van der Hoff | 2019-03-04 | 3 | -5/+5 |
| |/ |/| | | | | | | | In worker mode, on the federation sender, when we receive an edu for sending over the replication socket, it is parsed into an Edu object. There is no point extracting the contents of it so that we can then immediately build another Edu. | ||||
* | | Fix incorrect log about not persisting duplicate state event. (#4776) | Richard van der Hoff | 2019-03-01 | 1 | -3/+4 |
| | | | | | | We were logging this when it was not true. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-02-26 | 21 | -482/+1672 |
|\ \ | | | | | | | | | | anoa/public_rooms_federate_develop | ||||
| * | | Revert "Prevent showing non-fed rooms in fed /publicRooms" | Andrew Morgan | 2019-02-26 | 1 | -65/+11 |
| | | | |||||
| * | | Merge pull request #4736 from matrix-org/anoa/public_rooms_federate | Andrew Morgan | 2019-02-26 | 1 | -11/+65 |
| |\ \ | | | | | | | | | Config option to prevent showing non-fed rooms in fed /publicRooms | ||||
| | * | | 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 | 1 | -1/+1 |
| | | | | |||||
| | * | | Result may be None | Andrew Morgan | 2019-02-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Address rich comments | Andrew Morgan | 2019-02-26 | 1 | -6/+30 |
| | | | | |||||
| | * | | 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 ↵ | Erik Johnston | 2019-02-25 | 21 | -477/+1620 |
| | |\ \ | | | | | | | | | | | | | | | | anoa/public_rooms_federate | ||||
| | * | | | Docs and arg name clarification | Andrew Morgan | 2019-02-25 | 1 | -2/+15 |
| | | | | | |||||
| | * | | | Don't restrict non-fed rooms over client APIs | Andrew Morgan | 2019-02-25 | 1 | -11/+18 |
| | | | | | |||||
| | * | | | Config option to prevent showing non-fed rooms in fed /publicRooms | Andrew Morgan | 2019-02-25 | 1 | -2/+15 |
| | | | | | |||||
| * | | | | switch from google.com to recaptcha.net for reCAPTCHA (#4731) | Matthew Hodgson | 2019-02-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add trivial clarification about jemalloc * switch from google.com to recaptcha.net because https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally | ||||
| * | | | | Merge pull request #4737 from matrix-org/erikj/failure_log_tb | Erik Johnston | 2019-02-25 | 1 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | | | Log tracebacks correctly | ||||
| | * | | | | Log tracebacks correctly | Erik Johnston | 2019-02-25 | 1 | -1/+5 |
| | | |/ / | | |/| | | |||||
| * | | | | Fix typo | Erik Johnston | 2019-02-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | More comments | Erik Johnston | 2019-02-25 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Assert rather than clobber the values | Erik Johnston | 2019-02-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add comments and paranoia | Erik Johnston | 2019-02-25 | 1 | -2/+23 |
| | | | | | |||||
| * | | | | Fix backfill storing incorrect state for events | Erik Johnston | 2019-02-22 | 1 | -1/+4 |
| |/ / / | |||||
| * | | | Run push_receipts_to_remotes as background job (#4707) | Richard van der Hoff | 2019-02-21 | 1 | -34/+34 |
| | | | | | | | | | | | | I suspect the CPU usage metrics for this are going to /dev/null at the moment. | ||||
| * | | | Merge pull request #4263 from rkfg/develop | Erik Johnston | 2019-02-21 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | Prevent crash on pagination. | ||||
| | * | | Prevent crash on pagination. | rkfg | 2018-12-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix registration on workers (#4682) | Erik Johnston | 2019-02-20 | 3 | -8/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move RegistrationHandler init to HomeServer * Move post registration actions to RegistrationHandler * Add post regisration replication endpoint * Newsfile | ||||
| * | | | Merge pull request #4652 from matrix-org/babolivier/acme-delegated | Brendan Abolivier | 2019-02-19 | 1 | -4/+5 |
| |\ \ \ | | | | | | | | | | | Support .well-known delegation when issuing certificates through ACME | ||||
| | * | | | Fetch ACME domain into an instance member | Brendan Abolivier | 2019-02-19 | 1 | -4/+5 |
| | | | | | |||||
| | * | | | Use a configuration parameter to give the domain to generate a certificate for | Brendan Abolivier | 2019-02-18 | 1 | -25/+4 |
| | | | | | |||||
| | * | | | Merge branch 'develop' into babolivier/acme-delegated | Brendan Abolivier | 2019-02-18 | 3 | -10/+35 |
| | |\ \ \ | |||||
| | * | | | | Typo in info log | Andrew Morgan | 2019-02-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: babolivier <contact@brendanabolivier.com> | ||||
| | * | | | | Various cosmetics to make TravisCI happy | Brendan Abolivier | 2019-02-15 | 1 | -2/+5 |
| | | | | | | |||||
| | * | | | | Remove unused import | Brendan Abolivier | 2019-02-15 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Support .well-known delegation when issuing certificates through ACME | Brendan Abolivier | 2019-02-15 | 1 | -4/+23 |
| | | | | | | |||||
| * | | | | | Merge pull request #4642 from matrix-org/anoa/bans_room_upgrade | Andrew Morgan | 2019-02-19 | 1 | -0/+22 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Transfer bans on room upgrade | ||||
| | * | | | | | lint | Andrew Morgan | 2019-02-18 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Move member event processing and changelog fix | Andrew Morgan | 2019-02-18 | 1 | -9/+7 |
| | | | | | | | |||||
| | * | | | | | Membership events are done later | Andrew Morgan | 2019-02-18 | 1 | -12/+20 |
| | | | | | | | |||||
| | * | | | | | Transfer bans on room upgrade | Andrew Morgan | 2019-02-18 | 1 | -0/+14 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #4666 from matrix-org/erikj/register_login_split | Erik Johnston | 2019-02-18 | 1 | -8/+106 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Split out registration to worker | ||||
| | * | | | | | Move register_device into handler | Erik Johnston | 2019-02-18 | 1 | -4/+47 |
| | | | | | | | |||||
| | * | | | | | Split out registration to worker | Erik Johnston | 2019-02-18 | 1 | -4/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows registration to be handled by a worker, though the actual write to the database still happens on master. Note: due to the in-memory session map all registration requests must be handled by the same worker. | ||||
| * | | | | | | Merge pull request #4668 from matrix-org/erikj/catch_exceptions | Erik Johnston | 2019-02-18 | 1 | -5/+9 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Correctly handle HttpResponseException when handling device updates | ||||
| | * | | | | | | pep8 | Erik Johnston | 2019-02-18 | 1 | -1/+5 |
| | | | | | | | | |||||
| | * | | | | | | Correctly handle HttpResponseException | Erik Johnston | 2019-02-18 | 1 | -4/+4 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #4667 from matrix-org/erikj/fix_revoke_guest_access_workers | Erik Johnston | 2019-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Fix kicking guest users in worker mode | ||||
| | * | | | | | Fix kicking guest users in worker mode | Erik Johnston | 2019-02-18 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When guest_access changes from allowed to forbidden all local guest users should be kicked from the room. This did not happen when revocation was received from federation on a worker. Presumably broken in #4141 | ||||
| * | | | | | Merge pull request #4643 from matrix-org/erikj/catch_exceptions | Erik Johnston | 2019-02-18 | 2 | -5/+11 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Correctly handle RequestSendFailed exceptions | ||||
| | * | | | | Correctly handle RequestSendFailed exceptions | Erik Johnston | 2019-02-14 | 2 | -5/+11 |
| | |/ / / | | | | | | | | | | | | | | | | This mainly reduces the number of exceptions we log. | ||||
| * | | | | Only fetch aliases when publishing rooms | Erik Johnston | 2019-02-14 | 1 | -15/+15 |
| | | | | | |||||
| * | | | | Add configurable room list publishing rules | Erik Johnston | 2019-02-14 | 1 | -5/+24 |
| |/ / / | | | | | | | | | | | | | | | | | This allows specifying who and what is allowed to be published onto the public room list | ||||
| * | | | Run `black` on user directory code (#4635) | Amber Brown | 2019-02-13 | 1 | -44/+50 |
| | | | | |||||
| * | | | Merge pull request #4608 from matrix-org/anoa/acls_room_upgrade | Erik Johnston | 2019-02-12 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Transfer Server ACLs on room upgrade | ||||
| | * | | | Transfer Server ACLs on room upgrade | Andrew Morgan | 2019-02-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | make sure version is in body and wrap in linearizer queue | Hubert Chathi | 2019-02-08 | 1 | -11/+26 |
| | | | | | | | | | | | | | | | | | | | | also add tests | ||||
| * | | | | re-try to make isort happy | Hubert Chathi | 2019-02-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix import to make isort happy | Hubert Chathi | 2019-02-06 | 1 | -2/+7 |
| | | | | | |||||
| * | | | | add new endpoint to update backup versions | Hubert Chathi | 2019-02-06 | 1 | -1/+33 |
| | | | | | |||||
| * | | | | return proper error codes for some 404s | Hubert Chathi | 2019-02-06 | 1 | -4/+16 |
| |/ / / | |||||
| * | | | Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatable | Andrew Morgan | 2019-01-31 | 1 | -0/+10 |
| |\ \ \ | | | | | | | | | | | Copy over non-federatable trait on room upgrade | ||||
| | * | | | New function for getting room's create event | Andrew Morgan | 2019-01-31 | 1 | -7/+1 |
| | | | | | |||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-31 | 1 | -1/+13 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | anoa/room_upgrade_federatable | ||||
| | * | | | | lint | Andrew Morgan | 2019-01-31 | 1 | -2/+4 |
| | | | | | | |||||
| | * | | | | Copy over non-federatable trait on room upgrade | Andrew Morgan | 2019-01-30 | 1 | -0/+14 |
| | | | | | | |||||
| * | | | | | Add some debug for membership syncing issues (#4538) | Richard van der Hoff | 2019-01-31 | 1 | -2/+11 |
| | |/ / / | |/| | | | | | | | | I can't figure out what's going on with #4422 and #4436; perhaps this will help. | ||||
| * | | | | Fix remote invite rejections not comming down sync | Erik Johnston | 2019-01-30 | 1 | -1/+13 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken in PR #4405, commit 886e5ac, where we changed remote rejections to be outliers. The fix is to explicitly add the leave event in when we know its an out of band invite. We can't always add the event as if the server is/was in the room there might be more events to send down the sync than just the leave. | ||||
| * | | | ACME config cleanups (#4525) | Richard van der Hoff | 2019-01-30 | 1 | -12/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Handle listening for ACME requests on IPv6 addresses the weird url-but-not-actually-a-url-string doesn't handle IPv6 addresses without extra quoting. Building a string which you are about to parse again seems like a weird choice. Let's just use listenTCP, which is consistent with what we do elsewhere. * Clean up the default ACME config make it look a bit more consistent with everything else, and tweak the defaults to listen on port 80. * newsfile | ||||
| * | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 2 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-29 | 2 | -1/+10 |
| |\ \ \ | | | | | | | | | | | | | | | | erikj/redactions_eiah | ||||
| | * | | | Use snder and not event ID domain to check if ours | Erik Johnston | 2019-01-29 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transaction queue only sends out events that we generate. This was done by checking domain of event ID, but that can no longer be used. Instead, we may as well use the sender field. | ||||
| | * | | | Remove event ID usage when checking if new room | Erik Johnston | 2019-01-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The event ID is changing, so we can no longer get the domain from it. On the other hand, the check is unnecessary. | ||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-29 | 2 | -29/+7 |
| |\| | | | | | | | | | | | | | | | | | | erikj/redactions_eiah | ||||
| | * | | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 1 | -28/+6 |
| | |\ \ \ | | | | | | | | | | | | | Refactor event building into EventBuilder | ||||
| | | * | | | Correctly set context.app_service | Erik Johnston | 2019-01-29 | 1 | -0/+2 |
| | | | | | | |||||
| | | * | | | Refactor event building into EventBuilder | Erik Johnston | 2019-01-29 | 1 | -29/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is so that everything is done in one place, making it easier to change the event format based on room version | ||||
| | * | | | | Fixup calls to `comput_event_signature` | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently pass FrozenEvent instead of `dict` to `compute_event_signature`, which works by accident due to `dict(event)` producing the correct result. This fixes PR #4493 commit 855a151 | ||||
| * / / / | Implement rechecking of redactions | Erik Johnston | 2019-01-29 | 1 | -1/+5 |
| |/ / / | |||||
| * | | | Merge pull request #4494 from matrix-org/erikj/fixup_event_validator | Erik Johnston | 2019-01-29 | 2 | -3/+8 |
| |\ \ \ | | | | | | | | | | | Split up event validation between event and builder | ||||
| | * | | | Split up event validation between event and builder | Erik Johnston | 2019-01-28 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The validator was being run on the EventBuilder objects, and so the validator only checked a subset of fields. With the upcoming EventBuilder refactor even fewer fields will be there to validate. To get around this we split the validation into those that can be run against an EventBuilder and those run against a fully fledged event. | ||||
| * | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 3 | -11/+23 |
| |\ \ \ \ | | |/ / / | |/| | | | Pass through room version to event auth | ||||
| | * | | | Correctly use default room version if none is set | Erik Johnston | 2019-01-28 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 3 | -10/+22 |
| | | | | | |||||
| * | | | | Change return syntax in doc string | Andrew Morgan | 2019-01-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-28 | 2 | -29/+53 |
| |\| | | | | | | | | | | | | | | | | | | anoa/dm_room_upgrade | ||||
| | * | | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 2 | -29/+53 |
| | |\ \ \ | | | | | | | | | | | | | Require event format version to parse or create events | ||||
| | | * | | | Require event format version to parse or create events | Erik Johnston | 2019-01-25 | 2 | -29/+53 |
| | | | | | | |||||
| * | | | | | Reuse predecessor method | Andrew Morgan | 2019-01-28 | 1 | -12/+8 |
| | | | | | | |||||
| * | | | | | Fixes | Andrew Morgan | 2019-01-25 | 1 | -39/+39 |
| | | | | | | |||||
| * | | | | | Clean up direct_rooms access | Andrew Morgan | 2019-01-25 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Use python magic | Andrew Morgan | 2019-01-25 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Destructure account data tuple before use | Andrew Morgan | 2019-01-25 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Remove unnecessary null check | Andrew Morgan | 2019-01-25 | 1 | -7/+6 |
| | | | | | | |||||
| * | | | | | Move room_tag declaration to be closer to its use | Andrew Morgan | 2019-01-25 | 1 | -4/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-01-25 | 5 | -34/+231 |
| |\| | | | | | | | | | | | | | | | | | | | | | | anoa/dm_room_upgrade | ||||
| | * | | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 1 | -0/+47 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | Ability to search entire room history after upgrading room | ||||
| | | * | | | Apply suggestions from code review | Richard van der Hoff | 2019-01-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com> | ||||
| | | * | | | Fix a bug with single-room search searching all rooms | Andrew Morgan | 2019-01-22 | 1 | -32/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create a new method for getting predecessor rooms * Remove formatting change | ||||
| | | * | | | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 1 | -0/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> | ||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813 | Erik Johnston | 2019-01-25 | 4 | -33/+183 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions | Erik Johnston | 2019-01-24 | 1 | -2/+15 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Add room_version param to get_pdu | ||||
| | | | * | | | | Review comments | Erik Johnston | 2019-01-24 | 1 | -0/+5 |
| | | | | | | | | |||||
| | | | * | | | | Add room_version param to get_pdu | Erik Johnston | 2019-01-23 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we add new event format we'll need to know the event format or room version when parsing events. | ||||
| | | * | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites | Erik Johnston | 2019-01-24 | 1 | -29/+3 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Store rejected remote invite events as outliers | ||||
| | | | * | | | | | Remove unecessary setting of outlier bit | Erik Johnston | 2019-01-24 | 1 | -2/+0 |
| | | | | | | | | | |||||
| | | | * | | | | | Use term 'out of band membership' instead | Erik Johnston | 2019-01-24 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | | | * | | | | | Clarify the invite flows | Erik Johnston | 2019-01-23 | 1 | -1/+11 |
| | | | | | | | | | |||||
| | | | * | | | | | Remove unnecessary '_sign_event' | Erik Johnston | 2019-01-23 | 1 | -14/+0 |
| | | | | | | | | | |||||
| | | | * | | | | | Store rejected remote invite events as outliers | Erik Johnston | 2019-01-23 | 1 | -32/+12 |
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently they're stored as non-outliers even though the server isn't in the room, which can be problematic in places where the code assumes it has the state for all non outlier events. In particular, there is an edge case where persisting the leave event triggers a state resolution, which requires looking up the room version from state. Since the server doesn't have the state, this causes an exception to be thrown. | ||||
| | | * | | | | | Change default timeout value from 0 to None | Andrew Morgan | 2019-01-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Use self.clock instead of datetime | Andrew Morgan | 2019-01-24 | 1 | -4/+3 |
| | | | | | | | | |||||
| | | * | | | | | isort | Andrew Morgan | 2019-01-24 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | lint | Andrew Morgan | 2019-01-24 | 1 | -1/+2 |
| | | | | | | | | |||||
| | | * | | | | | Time out filtered room dir queries after 60s | Andrew Morgan | 2019-01-24 | 1 | -2/+12 |
| | | |/ / / / | |||||
| | | * | | | | Add metric for user dir current event stream position | Andrew Morgan | 2019-01-23 | 1 | -0/+6 |
| | | | | | | | |||||
| | | * | | | | Support ACME for certificate provisioning (#4384) | Amber Brown | 2019-01-23 | 1 | -0/+147 |
| | | | | | | | |||||
| | * | | | | | Implement MSC 1813 - Add room version to make APIs | Erik Johnston | 2019-01-23 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | We also implement `make_membership_event` converting the returned room version to an event format version. | ||||
| * | | | | | Move tag and direct state copying into separate function | Andrew Morgan | 2019-01-25 | 1 | -43/+63 |
| | | | | | | |||||
| * | | | | | lint | Andrew Morgan | 2019-01-22 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Prevent duplicate room IDs in m.direct | Andrew Morgan | 2019-01-22 | 1 | -10/+9 |
| | | | | | | |||||
| * | | | | | Fix comments | Andrew Morgan | 2019-01-22 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Join logic covers both room creator and arbitrary users | Andrew Morgan | 2019-01-22 | 1 | -33/+0 |
| | | | | | | |||||
| * | | | | | tags, m.direct copying over correctly | Andrew Morgan | 2019-01-22 | 2 | -11/+62 |
| | | | | | | |||||
| * | | | | | Fix typos | Andrew Morgan | 2019-01-22 | 1 | -8/+8 |
| | | | | | | |||||
| * | | | | | Migrating dm and room tags work for migrator | Andrew Morgan | 2019-01-22 | 1 | -2/+13 |
| | | | | | | |||||
| * | | | | | Prevent crash on user who doesn't have any direct rooms | Andrew Morgan | 2019-01-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Preserve DM status of a room on upgrade | Andrew Morgan | 2019-01-22 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> | ||||
| * | | | | | Fix typo | Andrew Morgan | 2019-01-22 | 1 | -2/+2 |
| |/ / / / | |||||
| * / / / | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Migrate encryption state on room upgrade Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> * Add changelog file | ||||
| * | | | sign_request -> build_auth_headers (#4408) | Richard van der Hoff | 2019-01-17 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | Just got very confused about the fact that the headers are only an output, not an input. | ||||
| * | | | don't store more remote device lists if they have more than 1K devices (#4397) | Richard van der Hoff | 2019-01-16 | 1 | -0/+19 |
| | | | | |||||
| * | | | fix NPE in /messages by checking if all events were filtered out (#4330) | Matthew Hodgson | 2019-01-02 | 1 | -10/+11 |
| | | | | |||||
| * | | | Fixed line length | Nathan Pennie | 2018-12-19 | 1 | -1/+5 |
| | | | | |||||
| * | | | Fix the variable names used for account_data | Nathan Pennie | 2018-12-19 | 1 | -3/+3 |
| | | | | |||||
| * | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 3 | -23/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits. | ||||
| * | | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 1 | -7/+16 |
| | | | | | | | | | | | | | | | | | | | | When we register a new user from SAML2 data, initialise their displayname correctly. | ||||
| * | | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | This is mostly factoring out the post-CAS-login code to somewhere we can reuse it for other SSO flows, but it also fixes the userid mapping while we're at it. | ||||
| * | | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 1 | -29/+0 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rip out half-implemented m.login.saml2 support This was implemented in an odd way that left most of the work to the client, in a way that I really didn't understand. It's going to be a pain to maintain, so let's start by ripping it out. * drop undocumented dependency on dateutil It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat. | ||||
| * | | Add an option to disable search for homeservers which may not be interested ↵ | Travis Ralston | 2018-12-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | in it (#4230) This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data. | ||||
| * | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 1 | -2/+21 |
| | | | | | | | | | | | | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent | ||||
| * | | Remove duplicate slashes in generated consent URLs | Travis Ralston | 2018-11-15 | 1 | -1/+1 |
| | | | |||||
| * | | Remove hack to support rejoining rooms | Erik Johnston | 2018-11-09 | 1 | -74/+42 |
| | | | |||||
| * | | Simplify to always drop events if server isn't in the room | Erik Johnston | 2018-11-09 | 1 | -14/+9 |
| | | | |||||
| * | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | So people can still collect consent the old way if they want to. | ||||
| * | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -7/+15 |
| | | | | | | | | | fixes #4056 | ||||
| * | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 1 | -24/+24 |
| | | | | | | | | | | | | | | | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions. | ||||
| * | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 1 | -4/+10 |
| | | | |||||
| * | | Include a version query string arg for the consent route | Travis Ralston | 2018-10-31 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 8 | -133/+515 |
| |\ \ | |||||
| | * \ | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades | Richard van der Hoff | 2018-10-31 | 2 | -14/+140 |
| | |\ \ | | | | | | | | | | | Attempt to move room aliases on room upgrades | ||||
| | | * | | Avoid else clause on exception for clarity | Richard van der Hoff | 2018-10-31 | 1 | -2/+1 |
| | | | | | |||||
| | | * | | Attempt to move room aliases on room upgrades | Richard van der Hoff | 2018-10-31 | 2 | -14/+141 |
| | | | | | |||||
| | * | | | Log some bits about event creation (#4121) | Richard van der Hoff | 2018-10-31 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | I found these helpful in debugging my room upgrade tests. | ||||
| | * | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| | | | | | |||||
| | * | | | Delete the disused & unspecced identicon functionality (#4106) | Amber Brown | 2018-10-29 | 1 | -3/+0 |
| | |/ / | |||||
| | * | | Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar | Richard van der Hoff | 2018-10-29 | 1 | -1/+2 |
| | |\ \ | | | | | | | | | | | Remember to copy the avatar on room upgrades | ||||
| | | * | | Remember to copy the avatar on room upgrades | Richard van der Hoff | 2018-10-26 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Better handling of odd PLs during room upgrades | Richard van der Hoff | 2018-10-27 | 1 | -44/+81 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes handling of rooms where we have permission to send the tombstone, but not other state. We need to (a) fail more gracefully when we can't send the PLs in the old room, and (b) not set the PLs in the new room until we are done with the other stuff. | ||||
| | * | | optimise state copying | Richard van der Hoff | 2018-10-26 | 1 | -7/+5 |
| | | | | |||||
| | * | | Address review comments | Richard van der Hoff | 2018-10-26 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | Improve comments, get old room state from the context we already have | ||||
| | * | | restrict PLs in old room | Richard van der Hoff | 2018-10-25 | 1 | -1/+43 |
| | | | | |||||
| | * | | copy state | Richard van der Hoff | 2018-10-25 | 1 | -11/+26 |
| | | | | |||||
| | * | | preserve PLs | Richard van der Hoff | 2018-10-25 | 1 | -1/+7 |
| | | | | |||||
| | * | | preserve room visibility | Richard van der Hoff | 2018-10-25 | 1 | -3/+5 |
| | | | | |||||
| | * | | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 1 | -0/+121 |
| | | | | | | | | | | | | | | | | | | | | Currently just creates a new, empty, room, and sends a tombstone in the old room. | ||||
| | * | | Allow power_level_content_override=None for _send_events_for_new_room | Richard van der Hoff | 2018-10-25 | 1 | -5/+6 |
| | | | | |||||
| | * | | Make room_member_handler a member of RoomCreationHandler | Richard van der Hoff | 2018-10-25 | 2 | -8/+7 |
| | | | | | | | | | | | | | | | | ... to save passing it into `_send_events_for_new_room` | ||||
| | * | | Factor _generate_room_id out of create_room | Richard van der Hoff | 2018-10-25 | 1 | -22/+23 |
| | | | | | | | | | | | | | | | | we're going to need this for room upgrades. | ||||
| * | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 9 | -74/+100 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 2 | -9/+14 |
| |\ \ \ \ | |||||
| * | | | | | pep8 | Travis Ralston | 2018-10-15 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Ensure the terms params are actually provided | Travis Ralston | 2018-10-15 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Python is hard | Travis Ralston | 2018-10-15 | 1 | -5/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-15 | 1 | -0/+289 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update login terms structure for the proposed language support | Travis Ralston | 2018-10-12 | 1 | -4/+7 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-12 | 2 | -20/+37 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Use a flag rather than a new route for the public policy | Travis Ralston | 2018-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This also means that the template now has optional parameters, which will need to be documented somehow. | ||||
| * | | | | | | | Supply params for terms auth stage | Travis Ralston | 2018-10-03 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/1692 | ||||
| * | | | | | | | Incorporate Dave's work for GDPR login flows | Travis Ralston | 2018-10-03 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117 | ||||
* | | | | | | | | Put function def back to the way it was | Andrew Morgan | 2019-02-26 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Prevent showing non-fed rooms in fed /publicRooms | Andrew Morgan | 2019-02-26 | 1 | -12/+50 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -2/+6 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 5 | -86/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit. | ||||
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-25 | 8 | -43/+79 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | erikj/alias_disallow_list | ||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-10-25 | 13 | -103/+440 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | matthew/autocreate_autojoin | ||||
| | * | | | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebase | Erik Johnston | 2018-10-24 | 1 | -15/+15 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add v2 state resolution algorithm | ||||
| | | * | | | | | Comment | Erik Johnston | 2018-10-24 | 1 | -2/+5 |
| | | | | | | | | |||||
| | | * | | | | | Rename resolve_events_with_factory | Erik Johnston | 2018-10-24 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Fix up use of resolve_events_with_factory | Erik Johnston | 2018-10-16 | 1 | -13/+10 |
| | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts | Richard van der Hoff | 2018-10-24 | 3 | -4/+4 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Clean up the way logcontexts and threads work in the pushers | ||||
| | | * | | | | | Remove redundant run_as_background_process() from pusherpool | Richard van der Hoff | 2018-10-22 | 3 | -4/+4 |
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher` now always return synchronously, so we can remove the `defer.gatherResults` on their results, and the `run_as_background_process` wrappers can be removed too because the PusherPool methods will now complete quickly enough. |