Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix schema upgrade when dropping tables | Erik Johnston | 2019-04-09 | 1 | -1/+3 |
| | | | | | | | | We need to drop tables in the correct order due to foreign table constraints (on `application_services`), otherwise the DROP TABLE command will fail. Introduced in #4992. | ||||
* | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_k | Richard van der Hoff | 2019-04-09 | 3 | -71/+72 |
|\ | | | | | Rewrite Datastore.get_server_verify_keys | ||||
| * | Rewrite Datastore.get_server_verify_keys | Richard van der Hoff | 2019-04-09 | 2 | -49/+63 |
| | | | | | | | | Rewrite this so that it doesn't hammer the database. | ||||
| * | Replace SlavedKeyStore with a shim | Richard van der Hoff | 2019-04-08 | 1 | -14/+4 |
| | | | | | | | | | | since we're pulling everything out of KeyStore anyway, we may as well simplify it. | ||||
| * | Remove redundant merged_keys dict | Richard van der Hoff | 2019-04-08 | 1 | -8/+5 |
| | | | | | | | | | | | | There's no point in collecting a merged dict of keys: it is sufficient to consider just the new keys which have been fetched by the most recent key_fetch_fns. | ||||
* | | Bump psycopg requirement (#5032) | Richard van der Hoff | 2019-04-09 | 1 | -1/+3 |
|/ | |||||
* | Remove unused server_tls_certificates functions (#5028) | Richard van der Hoff | 2019-04-08 | 4 | -62/+5 |
| | | | | These have been unused since #4120, and with the demise of perspectives, it is unlikely that they will ever be used again. | ||||
* | add context to phonehome stats (#5020) | Neil Johnson | 2019-04-08 | 2 | -1/+5 |
| | | | | add context to phonehome stats | ||||
* | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys | Richard van der Hoff | 2019-04-08 | 1 | -1/+1 |
|\ | | | | | Fix from_server buglet in get_keys_from_perspectives | ||||
| * | Fix from_server buglet in get_keys_from_perspectives | Richard van der Hoff | 2019-04-08 | 1 | -1/+1 |
| | | | | | | | | | | make sure we store the name of the server the keys came from, rather than the origin server, after doing a fetch-from-perspectives. | ||||
* | | drop tables listed in #1830 (#4992) | Neil Johnson | 2019-04-08 | 24 | -752/+42 |
|/ | | | | | | | | | | | | | | | Tables dropped: * application_services, * application_services_regex, * transaction_id_to_pdu, * stats_reporting * current_state_resets * event_content_hashes * event_destinations * event_edge_hashes * event_signatures * feedback * room_hosts * state_forward_extremities | ||||
* | Merge pull request #5001 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2019-04-08 | 2 | -33/+50 |
|\ | | | | | Cleanups in the Keyring | ||||
| * | Hoist server_name check out of process_v2_response | Richard van der Hoff | 2019-04-04 | 1 | -13/+7 |
| | | | | | | | | | | It's easier to check it in the caller than to complicate the interface with an extra param. | ||||
| * | Clean up Keyring.process_v2_response | Richard van der Hoff | 2019-04-04 | 1 | -23/+46 |
| | | | | | | | | | | | | Make this just return the key dict, rather than a single-entry dict mapping the server name to the key dict. It's easy for the caller to get the server name from from the response object anyway. | ||||
| * | Fix docstring on get_server_keys_json | Richard van der Hoff | 2019-04-04 | 1 | -2/+2 |
| | | |||||
* | | Add config option to block users from looking up 3PIDs (#5010) | Brendan Abolivier | 2019-04-04 | 2 | -0/+10 |
| | | |||||
* | | Clean up the database pagination code (#5007) | Amber Brown | 2019-04-05 | 2 | -67/+63 |
| | | | | | | | | | | | | | | | | * rewrite & simplify * changelog * cleanup potential sql injection | ||||
* | | Merge pull request #5002 from matrix-org/erikj/delete_group | Erik Johnston | 2019-04-04 | 3 | -0/+136 |
|\ \ | | | | | | | Add delete group admin API | ||||
| * | | Add admin API for group deletion | Erik Johnston | 2019-04-03 | 1 | -0/+26 |
| | | | |||||
| * | | Add functions to delete a group | Erik Johnston | 2019-04-03 | 2 | -0/+110 |
| | | | |||||
* | | | Prevent kicking users who aren't in the room (#4999) | Andrew Morgan | 2019-04-04 | 1 | -0/+9 |
| | | | | | | | | | Prevent kick events from succeeding if the user is not currently in the room. | ||||
* | | | Avoid redundant URL encoding (#4555) | Marcel Krüger | 2019-04-04 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | * Do not double encode fallback redirect URL Signed-off-by: Marcel Fabian Krüger <zauguin@gmail.com> | ||||
* / | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 11 | -18/+29 |
|/ | |||||
* | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 7 | -338/+22 |
| | | | Remove presence list support as per MSC 1819 | ||||
* | Merge pull request #4982 from matrix-org/erikj/msc1915 | Erik Johnston | 2019-04-03 | 6 | -17/+215 |
|\ | | | | | Implement MSC1915 - 3PID unbind APIs | ||||
| * | Correctly handle id_server param | Erik Johnston | 2019-04-02 | 1 | -0/+1 |
| | | |||||
| * | Remove threepid binding if id server returns 400/404/501 | Erik Johnston | 2019-04-02 | 1 | -9/+10 |
| | | |||||
| * | Fixup docstrings | Erik Johnston | 2019-04-02 | 3 | -7/+9 |
| | | |||||
| * | Add unbind API to /r0 as it is now stabalised | Erik Johnston | 2019-04-01 | 1 | -1/+1 |
| | | |||||
| * | Grandfather in existing user threepids | Erik Johnston | 2019-04-01 | 2 | -0/+37 |
| | | | | | | | | | | | | We assume, as we did before, that users bound their threepid to one of the trusted identity servers. So we simply fill the new table with all threepids in `user_threepids` joined with the trusted identity servers. | ||||
| * | Allowing specifying IS to use in unbind API. | Erik Johnston | 2019-04-01 | 4 | -8/+20 |
| | | | | | | | | | | | | | | | | | | | | By default the homeserver will use the identity server used during the binding of the 3PID to unbind the 3PID. However, we need to allow clients to explicitly ask the homeserver to unbind via a particular identity server, for the case where the 3PID was bound out of band from the homeserver. Implements MSC915. | ||||
| * | For unbind poke IS used during binding of 3PID | Erik Johnston | 2019-04-01 | 1 | -9/+35 |
| | | | | | | | | | | | | | | | | This changes the behaviour from using the server specified trusted identity server to using the IS that used during the binding of the 3PID, if known. This is the behaviour specified by MSC1915. | ||||
| * | Track IS used to bind 3PIDs | Erik Johnston | 2019-04-01 | 3 | -0/+119 |
| | | | | | | | | | | This will then be used to know which IS to default to when unbinding the threepid. | ||||
* | | Run black on the rest of the storage module (#4996) | Amber Brown | 2019-04-03 | 41 | -2455/+2130 |
| | | |||||
* | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startup | Erik Johnston | 2019-04-02 | 4 | -8/+73 |
|\ \ | | | | | | | Make starting pushers faster during start up | ||||
| * | | Make starting pushers faster during start up | Erik Johnston | 2019-04-02 | 4 | -8/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We start all pushers on start up and immediately start a background process to fetch push to send. This makes start up incredibly painful when dealing with many pushers. Instead, let's do a quick fast DB check to see if there *may* be push to send and only start the background processes for those pushers. We also stagger starting up and doing those checks so that we don't try and handle all pushers at once. | ||||
* | | | Transfer related groups on room upgrade (#4990) | Andrew Morgan | 2019-04-02 | 2 | -0/+2 |
| | | | | | | | | | Transfers the m.room.related_groups state event on room upgrade. | ||||
* | | | Add config.signing_key_path. (#4974) | Richard van der Hoff | 2019-04-02 | 1 | -1/+2 |
|/ / | | | | | | | | | | | As requested by @andrewshadura | ||||
* | | Fix sync bug when accepting invites (#4956) | Richard van der Hoff | 2019-04-02 | 3 | -20/+40 |
| | | | | | | | | | | | | | | | | | | | | Hopefully this time we really will fix #4422. We need to make sure that the cache on `get_rooms_for_user_with_stream_ordering` is invalidated *before* the SyncHandler is notified for the new events, and we can now do so reliably via the `events` stream. | ||||
* | | Merge branch 'master' into develop | Neil Johnson | 2019-04-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3 | Neil Johnson | 2019-04-01 | 1 | -1/+1 |
| | | | |||||
| * | | bump version | Neil Johnson | 2019-03-27 | 1 | -1/+1 |
| | | | |||||
* | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 18 | -142/+188 |
| |/ |/| | | | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions. | ||||
* | | Merge pull request #4955 from matrix-org/rav/merge_state_into_events | Richard van der Hoff | 2019-03-28 | 8 | -49/+140 |
|\ \ | | | | | | | Combine the CurrentStateDeltaStream into the EventStream | ||||
| * | | Combine the CurrentStateDeltaStream into the EventStream | Richard van der Hoff | 2019-03-27 | 5 | -33/+43 |
| | | | |||||
| * | | Make EventStream rows have a type | Richard van der Hoff | 2019-03-27 | 4 | -17/+98 |
| | | | | | | | | | | | | ... as a precursor to combining it with the CurrentStateDelta stream. | ||||
* | | | Merge pull request #4954 from matrix-org/rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 3 | -5/+21 |
|\ \ \ | | | | | | | | | Refactors to replication stream row update/parsing | ||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 2 | -380/+335 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Skip building a ROW_TYPE when building updates | Richard van der Hoff | 2019-03-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | We're about to turn it straight into a JSON object anyway so building a ROW_TYPE is a bit pointless, and reduces flexibility in the update_function. | ||||
| * | | | Add parse_row method to replication stream class | Richard van der Hoff | 2019-03-27 | 3 | -3/+19 |
| | | | | | | | | | | | | | | | | This will allow individual stream classes to override how a row is parsed. | ||||
* | | | | remove log line for password (#4965) | Neil Johnson | 2019-03-28 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | Remove log line for password. | ||||
* | | | | Allow password providers to bind emails (#4947) | Andrew Morgan | 2019-03-28 | 2 | -4/+22 |
| | | | | | | | | | | | | This PR allows password provider modules to bind email addresses when a user is registering and is motivated by matrix-org/matrix-synapse-ldap3#58 | ||||
* | | | | Merge pull request #4942 from matrix-org/erikj/fix_presence | Erik Johnston | 2019-03-28 | 3 | -32/+236 |
|\ \ \ \ | |_|/ / |/| | | | Use event streams to calculate presence | ||||
| * | | | Use an assert | Erik Johnston | 2019-03-28 | 1 | -2/+1 |
| | | | | |||||
| * | | | Review comments | Erik Johnston | 2019-03-28 | 1 | -44/+62 |
| | | | | |||||
| * | | | Use event streams to calculate presence | Erik Johnston | 2019-03-27 | 3 | -32/+219 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streams | Richard van der Hoff | 2019-03-28 | 6 | -76/+133 |
|\ \ \ | | |/ | |/| | Split up replication.tcp.streams into smaller files | ||||
| * | | move FederationStream out to its own file | Richard van der Hoff | 2019-03-27 | 4 | -23/+43 |
| | | | |||||
| * | | move EventsStream out to its own file | Richard van der Hoff | 2019-03-27 | 3 | -23/+42 |
| | | | |||||
| * | | Move replication.tcp.streams into a package | Richard van der Hoff | 2019-03-27 | 3 | -34/+52 |
| | | | |||||
* | | | Run `black` on some storage modules that the stats branch touches (#4959) | Amber Brown | 2019-03-29 | 2 | -380/+335 |
|/ / | |||||
* / | Fix/improve some docstrings in the replication code. (#4949) | Richard van der Hoff | 2019-03-27 | 2 | -7/+19 |
|/ | |||||
* | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 6 | -26/+122 |
| | | | | | 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. | ||||
* | Use the state event amount for userdir import batching, not room count (#4944) | Amber Brown | 2019-03-27 | 1 | -8/+20 |
| | |||||
* | Make federation endpoints more tolerant of trailing slashes v2 (#4935) | Andrew Morgan | 2019-03-26 | 3 | -8/+9 |
| | | | Redo of https://github.com/matrix-org/synapse/pull/4840 | ||||
* | Fix ClientReplicationStreamProtocol.__str__ (#4929) | Richard van der Hoff | 2019-03-25 | 2 | -4/+5 |
| | | | | | | | | `__str__` depended on `self.addr`, which was absent from ClientReplicationStreamProtocol, so attempting to call str on such an object would raise an exception. We can calculate the peer addr from the transport, so there is no need for addr anyway. | ||||
* | Fix bug where read-receipts lost their timestamps (#4927) | Richard van der Hoff | 2019-03-25 | 3 | -12/+30 |
| | | | | | Make sure that they are sent correctly over the replication stream. Fixes: #4898 | ||||
* | Refactor out state delta handling into its own class (#4917) | Amber Brown | 2019-03-25 | 4 | -110/+151 |
| | |||||
* | Merge pull request #4869 from matrix-org/erikj/yaml_load | Erik Johnston | 2019-03-22 | 3 | -5/+5 |
|\ | | | | | Fix yaml warnings by using safe_load | ||||
| * | Use yaml safe_load | Erik Johnston | 2019-03-22 | 3 | -5/+5 |
| | | |||||
* | | Remove trailing slashes from outbound federation requests and retry on 400 ↵ | Andrew Morgan | 2019-03-21 | 2 | -17/+89 |
|\ \ | |/ |/| | | | | | (#4840) As per #3622, we remove trailing slashes from outbound federation requests. However, to ensure that we remain backwards compatible with previous versions of Synapse, if we receive a HTTP 400 with `M_UNRECOGNIZED`, then we are likely talking to an older version of Synapse in which case we retry with a trailing slash appended to the request path. | ||||
| * | Clean up backoff_on_404 and metehod calls | Andrew Morgan | 2019-03-21 | 1 | -9/+13 |
| | | |||||
| * | kwargs doesn't like commas on calling funcs either. TIL | Andrew Morgan | 2019-03-20 | 1 | -2/+2 |
| | | |||||
| * | lint | Andrew Morgan | 2019-03-20 | 1 | -2/+6 |
| | | |||||
| * | New test, fix issues | Andrew Morgan | 2019-03-20 | 1 | -49/+28 |
| | | |||||
| * | Fix comments. v0.99.2 -> v0.99.3 | Andrew Morgan | 2019-03-20 | 1 | -5/+5 |
| | | |||||
| * | Just return if not doing any trailing slash shennanigans | Andrew Morgan | 2019-03-20 | 1 | -0/+2 |
| | | |||||
| * | lint | Andrew Morgan | 2019-03-18 | 1 | -1/+1 |
| | | |||||
| * | Better exception handling | Andrew Morgan | 2019-03-18 | 1 | -16/+17 |
| | | |||||
| * | Correct var name | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
| | | |||||
| * | receiving a 400 caused an exception. handle it | Andrew Morgan | 2019-03-13 | 1 | -5/+12 |
| | | |||||
| * | is this what purgatory feels like | Andrew Morgan | 2019-03-13 | 1 | -3/+3 |
| | | |||||
| * | i should have given up x2 | Andrew Morgan | 2019-03-13 | 1 | -18/+13 |
| | | |||||
| * | i should have given up | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| | | |||||
| * | there comes a time when you should give up. but you dont | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| | | |||||
| * | as above | Andrew Morgan | 2019-03-13 | 1 | -2/+4 |
| | | |||||
| * | no kwargs today | Andrew Morgan | 2019-03-13 | 1 | -7/+12 |
| | | |||||
| * | Or perhaps I was the one who was drunk | Andrew Morgan | 2019-03-13 | 1 | -6/+3 |
| | | |||||
| * | go home python, you're drunk | Andrew Morgan | 2019-03-13 | 1 | -4/+2 |
| | | |||||
| * | Syntax checker is bork | Andrew Morgan | 2019-03-13 | 1 | -6/+5 |
| | | |||||
| * | Destructure again | Andrew Morgan | 2019-03-13 | 1 | -7/+8 |
| | | |||||
| * | Are you happy now | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
| | | |||||
| * | Syntax test | Andrew Morgan | 2019-03-13 | 1 | -6/+5 |
| | | |||||
| * | Remove testing code | Andrew Morgan | 2019-03-13 | 1 | -3/+0 |
| | | |||||
| * | Add missing docstring detail | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| | | |||||
| * | Fix syntax issues | Andrew Morgan | 2019-03-13 | 1 | -7/+10 |
| | | |||||
| * | Switch to wrapper function around _send_request | Andrew Morgan | 2019-03-13 | 2 | -37/+76 |
| | | |||||
| * | Retry on 400:M_UNRECOGNIZED | Andrew Morgan | 2019-03-13 | 1 | -6/+10 |
| | | |||||
| * | Fix paranthesis indent | Andrew Morgan | 2019-03-13 | 1 | -1/+2 |
| | | |||||
| * | Add workaround note | Andrew Morgan | 2019-03-13 | 1 | -10/+4 |
| | | |||||
| * | Cleaner way of implementing trailing slashes | Andrew Morgan | 2019-03-12 | 2 | -68/+62 |
| | | |||||
| * | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 2 | -9/+9 |
| |\ | |||||
| * \ | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 4 | -19/+53 |
| |\ \ | |||||
| * | | | lint | Andrew Morgan | 2019-03-08 | 1 | -1/+3 |
| | | | | |||||
| * | | | Retry certain federation requests on 404 | Andrew Morgan | 2019-03-08 | 2 | -5/+50 |
| | | | | |||||
| * | | | Remove trailing slashes from outbound federation requests | Andrew Morgan | 2019-03-08 | 1 | -7/+7 |
| | | | | |||||
* | | | | 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 | 6 | -24/+62 |
|\| | | | | | | | | | | | | | | Fixup shutdown room API | ||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | 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 | 3 | -0/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 |
| | | | | | | |||||
| * | | | | | Fix up config comments | Erik Johnston | 2019-03-20 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | Add option to disable search room lists | Erik Johnston | 2019-03-19 | 2 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | This disables both local and remote room list searching. | ||||
* | | | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_search | Erik Johnston | 2019-03-20 | 2 | -0/+15 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Add option to disable searching in the user dir | ||||
| * | | | | | Fix up sample config | Erik Johnston | 2019-03-20 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | Update synapse/config/user_directory.py | Richard van der Hoff | 2019-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re> | ||||
| * | | | | | Add option to disable searching in the user dir | Erik Johnston | 2019-03-19 | 2 | -0/+13 |
| |/ / / / | | | | | | | | | | | | | | | | We still populate it, as it can still be accessed via the admin API. | ||||
* | | | | | Batching in the user directory import (#4900) | Amber Brown | 2019-03-21 | 1 | -0/+13 |
| | | | | | |||||
* | | | | | Add a config option for torture-testing worker replication. (#4902) | Richard van der Hoff | 2019-03-20 | 2 | -1/+22 |
| | | | | | | | | | | | | | | | Setting this to 50 or so makes a bunch of sytests fail in worker mode. | ||||
* | | | | | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 4 | -22/+171 |
|/ / / / | | | | | | | | | | | | | Rate-limit outgoing read-receipts as per #4730. | ||||
* | | | | Use a regular HomeServerConfig object for unit tests | Richard van der Hoff | 2019-03-19 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than using a Mock for the homeserver config, use a genuine HomeServerConfig object. This makes for a more realistic test, and means that we don't have to keep remembering to add things to the mock config every time we add a new config setting. | ||||
* | | | | Merge remote-tracking branch 'origin/develop' into HEAD | Richard van der Hoff | 2019-03-19 | 3 | -4/+16 |
|\ \ \ \ | |||||
| * | | | | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 2 | -3/+15 |
| | | | | | |||||
| * | | | | Fix user directory background update (#4887) | Erik Johnston | 2019-03-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 1 | -3/+5 |
|/ / / / | | | | | | | | | | | | | | | | | Fixes a bug where hs_disabled_message was not enforced for 3pid-based requests if there was no server_notices_mxid configured. | ||||
* | | | | Comment out most options in the generated config. (#4863) | Richard van der Hoff | 2019-03-19 | 14 | -98/+149 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it so that most options in the config are optional, and commented out in the generated config. The reasons this is a good thing are as follows: * If we decide that we should change the default for an option, we can do so, and only those admins that have deliberately chosen to override that option will be stuck on the old setting. * It moves us towards a point where we can get rid of the super-surprising feature of synapse where the default settings for the config come from the generated yaml. * It makes setting up a test config for unit testing an order of magnitude easier (see forthcoming PR). * It makes the generated config more consistent, and hopefully easier for users to understand. | ||||
* | | | | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 4 | -256/+325 |
| | | | | |||||
* | | | | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 2 | -5/+32 |
| | | | | |||||
* | | | | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 6 | -22/+102 |
| | | | | | | | | | | | | Add two ratelimiters on login (per-IP address and per-userID). | ||||
* | | | | Merge pull request #4855 from matrix-org/rav/refactor_transaction_queue | Richard van der Hoff | 2019-03-15 | 7 | -761/+864 |
|\ \ \ \ | | | | | | | | | | | Split TransactionQueue up | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | This is easier than having to have a million fields keyed on destination. | ||||
* | | | | | Merge pull request #4852 from matrix-org/rav/move_rr_sending_to_worker | Richard van der Hoff | 2019-03-15 | 5 | -55/+110 |
|\| | | | | | | | | | | | | | | Move client receipt processing to federation sender worker. | ||||
| * | | | | Move client receipt processing to federation sender worker. | Richard van der Hoff | 2019-03-13 | 4 | -33/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -24/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 #4853 from matrix-org/erikj/worker_docker_ci | Erik Johnston | 2019-03-15 | 4 | -17/+53 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow passing --daemonize to workers | ||||
| * | | | | | Correctly handle all command line options | Erik Johnston | 2019-03-14 | 3 | -16/+42 |
| | | | | | | |||||
| * | | | | | Allow passing --daemonize to workers | Erik Johnston | 2019-03-13 | 2 | -1/+11 |
| | | | | | | |||||
* | | | | | | Revert "Make federation endpoints more tolerant of trailing slashes for some ↵ | Erik Johnston | 2019-03-14 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoints (#4793)" This reverts commit 290552fd836f4ae2dc1d893a7f72f7fff85365d3. | ||||
* | | | | | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 7 | -123/+183 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Improve searching in the userdir | ||||
| * | | | | | fixup | Amber Brown | 2019-03-13 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | fixup | Amber Brown | 2019-03-13 | 3 | -55/+16 |
| | | | | | | |||||
| * | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fixup | Amber Brown | 2019-03-12 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | fixup | Amber Brown | 2019-03-12 | 3 | -160/+139 |
| | | | | | | |||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | fixes | Amber Brown | 2019-03-12 | 3 | -48/+62 |
| | | | | | | |||||
| * | | | | | 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 | 4 | -19/+53 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | initial | Amber Brown | 2019-03-11 | 4 | -4/+102 |
| | |_|/ / | |/| | | | |||||
* | | | | | Document using a certificate with a full chain (#4849) | Andrew Morgan | 2019-03-13 | 1 | -0/+5 |
| |_|/ / |/| | | | |||||
* | | | | Transfer local user's push rules on room upgrade (#4838) | Andrew Morgan | 2019-03-12 | 2 | -0/+61 |
| | | | | | | | | | | | | Transfer push rules (notifications) on room upgrade | ||||
* | | | | Clarify what registration_shared_secret allows for (#2885) (#4844) | Aaron Raimist | 2019-03-11 | 1 | -2/+2 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarify what registration_shared_secret allows for (#2885) Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
* | | | Make federation endpoints more tolerant of trailing slashes for some ↵ | Andrew Morgan | 2019-03-11 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | endpoints (#4793) Server side of a solution towards #3622. | ||||
* | | | Correctly log expected errors when fetching server keys | Erik Johnston | 2019-03-11 | 1 | -2/+2 |
| |/ |/| | |||||
* | | fix incorrect encoding of filenames with spaces in (#2090) | Matthew Hodgson | 2019-03-11 | 1 | -3/+51 |
| | | | | | | | | fixes https://github.com/vector-im/riot-web/issues/3155 | ||||
* | | Add comment to schema | Erik Johnston | 2019-03-08 | 1 | -0/+2 |
| | | |||||
* | | Make `prev_state` field optional | Erik Johnston | 2019-03-08 | 2 | -16/+0 |
|/ | | | | | | | The `prev_state` field on events is not specced and so synapse shouldn't explode if an event is missing the field. Fixes #4787 | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-03-08 | 17 | -426/+384 |
|\ | | | | | | | 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 | 3 | -366/+174 |
| | | |||||
| * | Merge pull request #4779 from matrix-org/travis/icons | Travis Ralston | 2019-03-06 | 3 | -7/+7 |
| |\ | | | | | | | Use static locations for Riot icons | ||||
| | * | Use static locations for Riot icons | Travis Ralston | 2019-03-01 | 3 | -7/+7 |
| | | | | | | | | | See https://github.com/vector-im/riot-web/issues/9009 | ||||
| * | | Merge pull request #4818 from matrix-org/erikj/prefill_client_ips | Erik Johnston | 2019-03-06 | 1 | -0/+2 |
| |\ \ | | | | | | | | | Prefill client IPs cache on workers | ||||
| | * | | 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 | 2 | -7/+45 |
| |\ \ \ | | | | | | | | | | | Add docstrings from matrix-org-hotfixes | ||||
| | * | | | 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 | 1 | -7/+46 |
| |\ \ \ | | | | | | | | | | | Port #4422 debug logging from hotfixes | ||||
| | * | | | Port #4422 debug logging from hotfixes | Erik Johnston | 2019-03-06 | 1 | -7/+46 |
| | |/ / | |||||
| * / / | Send message after room has been shutdown | Erik Johnston | 2019-03-06 | 1 | -11/+11 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | Currently the explanation message is sent to the abuse room before any users are forced joined, which means it tends to get lost in the backlog of joins. So instead we send the message *after* we've forced joined everyone. | ||||
| * | | Merge pull request #4792 from matrix-org/anoa/replication_tokens | Andrew Morgan | 2019-03-06 | 1 | -3/+28 |
| |\ \ | | | | | | | | | Support batch updates in the worker sender | ||||
| | * | | 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 |
| | | | | |||||
| | * | | Prevent replication wedging | Andrew Morgan | 2019-03-04 | 1 | -4/+24 |
| | | | | |||||
| * | | | 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 | 5 | -11/+7 |
| | | | | | | | | | | | | | | | | This reverts commit d7dbad3526136cfc9fdbd568635be5016fb637db. | ||||
| * | | | Split ratelimiters in two (one for events, one for registration) | Brendan Abolivier | 2019-03-05 | 5 | -7/+11 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
* | | | | 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 | 1 | -0/+23 |
|\ \ \ | | | | | | | | | Add 'server_version' endpoint to admin API | ||||
| * | | | Add 'server_version' endpoint to admin API | Joseph Weston | 2019-03-01 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | This is required because the 'Server' HTTP header is not always passed through proxies. | ||||
* | | | | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 6 | -31/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 #4794 from matrix-org/anoa/erroneous_dollahs | Andrew Morgan | 2019-03-05 | 1 | -22/+22 |
|\ \ \ \ | | | | | | | | | | | Remove unnecessary dollar signs | ||||
| * | | | | Remove unnecessary dollar signs | Andrew Morgan | 2019-03-04 | 1 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | A dollar sign is already appended to the end of each PATH, so there's no need to add one in the PATH declaration as well. | ||||
* | | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_room | Erik Johnston | 2019-03-05 | 3 | -29/+126 |
|\ \ \ \ \ | | | | | | | | | | | | | Stop backpaginating when events not visible | ||||
| * | | | | | clarify comments | Erik Johnston | 2019-03-05 | 2 | -9/+12 |
| | | | | | | |||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-03-04 | 36 | -191/+571 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | 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 | 3 | -5/+78 |
| | | | | | | |||||
* | | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_code | Erik Johnston | 2019-03-05 | 1 | -60/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Clean ups in replication notifier | ||||
| * | | | | | | Remove redundant PreserveLoggingContext | Richard van der Hoff | 2019-03-04 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both (!) things that register as replication listeners do the right thing wrt logcontexts, so this is redundant. | ||||
| * | | | | | | Remove unused `wait_for_replication` method | Richard van der Hoff | 2019-03-04 | 1 | -50/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | I guess this was used once? It's not now, anyway. | ||||
* | | | | | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keys | Erik Johnston | 2019-03-05 | 9 | -747/+762 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow /keys/{changes,query} API to run on worker | ||||
| * | | | | | | | Allow /keys/{changes,query} API to run on worker | Erik Johnston | 2019-03-04 | 2 | -2/+13 |
| | | | | | | | | |||||
| * | | | | | | | 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 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Add some debug about processing read receipts. | Richard van der Hoff | 2019-03-04 | 1 | -6/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm hoping to establish which rooms are having lots of RRs sent for them, and how old the events are when they are sent. | ||||
* | | | | | | | 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. | ||||
* | | | | | | Include a default configuration file in the 'docs' directory. (#4791) | Richard van der Hoff | 2019-03-04 | 4 | -13/+25 |
|/ / / / / | |||||
* | / / / | Avoid rebuilding Edu objects in worker mode (#4770) | Richard van der Hoff | 2019-03-04 | 5 | -19/+36 |
| |/ / / |/| | | | | | | | | | | | | | | | 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 'master' into develop | Richard van der Hoff | 2019-03-01 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | 0.99.2 | Richard van der Hoff | 2019-03-01 | 1 | -1/+1 |
| | | | |||||
* | | | Minor docstring fixes for MatrixFederationAgent (#4765) | Andrew Morgan | 2019-02-28 | 1 | -1/+5 |
| | | | |||||
* | | | Make 'event_id' a required parameter in federated state requests (#4741) | Amber Brown | 2019-02-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make 'event_id' a required parameter in federated state requests As per the spec: https://matrix.org/docs/spec/server_server/r0.1.1.html#id40 Signed-off-by: Joseph Weston <joseph@weston.cloud> * add changelog entry for bugfix Signed-off-by: Joseph Weston <joseph@weston.cloud> * Update server.py | ||||
* | | | Fix parsing of Content-Disposition headers (#4763) | Richard van der Hoff | 2019-02-27 | 1 | -20/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix parsing of Content-Disposition headers TIL: filenames in content-dispostion headers can contain semicolons, and aren't %-encoded. * fix python2 incompatibility * Fix docstrings | ||||
* | | | Move from TravisCI to BuildKite (#4752) | Amber Brown | 2019-02-27 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4759 from matrix-org/erikj/3pid_client_reader | Erik Johnston | 2019-02-27 | 2 | -33/+35 |
|\ \ \ | | | | | | | | | Move /account/3pid to client_reader | ||||
| * | | | Move /account/3pid to client_reader | Erik Johnston | 2019-02-27 | 2 | -33/+35 |
| | | | | |||||
* | | | | Merge pull request #4758 from matrix-org/erikj/use_presence_replication | Erik Johnston | 2019-02-27 | 2 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | When presence is disabled don't send over replication | ||||
| * | | | | When presence is enabled don't send over replication | Erik Johnston | 2019-02-27 | 2 | -2/+8 |
| |/ / / | |||||
* / / / | Move server key queries to federation reader | Erik Johnston | 2019-02-27 | 1 | -1/+5 |
|/ / / | |||||
* | | | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoff | Erik Johnston | 2019-02-27 | 3 | -5/+39 |
|\ \ \ | |/ / |/| | | Fix tightloop over connecting to replication server | ||||
| * | | Move connecting logic into ClientReplicationStreamProtocol | Erik Johnston | 2019-02-27 | 2 | -18/+17 |
| | | | |||||
| * | | Increase the max delay between retry attempts | Erik Johnston | 2019-02-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Otherwise if you have many workers they can easily take out master with their connection attempts | ||||
| * | | Fix tightloop over connecting to replication server | Erik Johnston | 2019-02-26 | 2 | -4/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the client failed to process incoming commands during the initial set up of the replication connection it would immediately disconnect and reconnect, resulting in a tightloop. This can happen, for example, when subscribing to a stream that has a row that is too long in the backlog. The fix here is to not consider the connection successfully set up until the client has succesfully subscribed and caught up with the streams. This ensures that the retry logic timers aren't reset until then, meaning that if an error does happen during start up the client will continue backing off before retrying again. | ||||
* | | | 0.99.2rc1 v0.99.2rc1 | Richard van der Hoff | 2019-02-27 | 1 | -1/+1 |
| | | | |||||
* | | | Limit cache invalidation replication line length (#4748) | Erik Johnston | 2019-02-27 | 2 | -5/+27 |
| | | | |||||
* | | | Add database version to phonehome stats. (#4753) | Richard van der Hoff | 2019-02-27 | 4 | -0/+45 |
|/ / | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-02-26 | 193 | -4548/+9279 |
|\ \ | | | | | | | | | | anoa/public_rooms_federate_develop | ||||
| * | | 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 |
| |\ \ | | | | | | | | | 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 | 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 |
| | | | |