Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | 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. | ||||
| * | 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 | ||||
| | * | | remove trailing whiter space | Neil Johnson | 2018-10-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix tuple | Richard van der Hoff | 2018-10-24 | 1 | -1/+2 |
| | | | | | | | | | | | | Co-Authored-By: neilisfragile <neil@matrix.org> | ||||
| | * | | remove errant exception and style | Neil Johnson | 2018-10-23 | 1 | -5/+5 |
| | | | | |||||
| | * | | clean up config error logic and imports | Neil Johnson | 2018-10-17 | 1 | -14/+16 |
| | | | | |||||
| | * | | no need to join room if creator | Neil Johnson | 2018-10-13 | 1 | -1/+2 |
| | | | | |||||
| | * | | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 1 | -3/+8 |
| | | | | |||||
| | * | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 5 | -42/+74 |
| | |\ \ | |||||
| | * | | | move logic into register, fix room alias localpart bug, tests | Neil Johnson | 2018-10-04 | 1 | -27/+18 |
| | | | | | |||||
| | * | | | emit room aliases event | Matthew Hodgson | 2018-09-29 | 1 | -3/+8 |
| | | | | | |||||
| | * | | | fix thinkos | Matthew Hodgson | 2018-09-29 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | fix UTs | Matthew Hodgson | 2018-09-28 | 1 | -4/+9 |
| | | | | | |||||
| | * | | | untested stab at autocreating autojoin rooms | Matthew Hodgson | 2018-09-28 | 1 | -0/+18 |
| | | | | | |||||
| * | | | | Add config option to control alias creation | Erik Johnston | 2018-10-19 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 9 | -74/+100 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | 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. | ||||
| * | | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation | Erik Johnston | 2018-10-24 | 2 | -32/+50 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | Clean up room alias creation | ||||
| | * | | | | | Clean up room alias creation | Erik Johnston | 2018-10-19 | 2 | -32/+50 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requests | Travis Ralston | 2018-10-23 | 1 | -2/+16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Handle HttpResponseException more safely for federated groups | ||||
| | * | | | | | Comments help | Travis Ralston | 2018-10-23 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | isort | Travis Ralston | 2018-10-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | More sane handling of group errors and pep8 | Travis Ralston | 2018-10-12 | 1 | -4/+5 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' into travis/fix-federated-group-requests | Travis Ralston | 2018-10-12 | 7 | -91/+181 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Remove debugging statement | Travis Ralston | 2018-09-26 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Handle HttpResponseException more safely for federated groups | Travis Ralston | 2018-09-26 | 1 | -2/+11 |
| | | | | | | | | |||||
| * | | | | | | | Give some more things logcontexts (#4077) | Richard van der Hoff | 2018-10-23 | 2 | -7/+11 |
| | | | | | | | | |||||
| * | | | | | | | Correctly account for cpu usage by background threads (#4074) | Richard van der Hoff | 2018-10-23 | 1 | -14/+4 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap calls to deferToThread() in a thing which uses a child logcontext to attribute CPU usage to the right request. While we're in the area, remove the logcontext_tracer stuff, which is never used, and afaik doesn't work. Fixes #4064 | ||||
* | | | | | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 2 | -9/+14 |
|\| | | | | | | |||||
| * | | | | | | Fix roomlist since tokens on Python 3 (#4046) | Will Hunt | 2018-10-17 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | Thanks @Half-Shot !!! | ||||
| * | | | | | | Fix incorrect truncation in get_missing_events | Richard van der Hoff | 2018-10-16 | 1 | -7/+5 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite important that get_missing_events returns the *latest* events in the room; however we were pulling event ids out of the database until we got *at least* 10, and then taking the *earliest* of the results. We also shouldn't really be relying on depth, and should be checking the room_id. | ||||
* | | | | | | 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 |
|\| | | | | | |||||
| * | | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backups | David Baker | 2018-10-15 | 1 | -0/+289 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | E2E backups | ||||
| | * | | | | Linting soothes the savage PEP8 monster | David Baker | 2018-10-12 | 1 | -4/+9 |
| | | | | | | |||||
| | * | | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 1 | -20/+21 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 13 | -205/+498 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Apparently this blank line is Very Important | David Baker | 2018-10-09 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | be python3 compatible | David Baker | 2018-10-09 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 20 | -168/+546 |
| | |\ \ \ \ | |||||
| | * | | | | | support DELETE /version with no args | Matthew Hodgson | 2018-08-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 1 | -7/+28 |
| | | | | | | | |||||
| | * | | | | | switch get_current_version_info back to being get_version_info | Matthew Hodgson | 2018-08-12 | 1 | -4/+7 |
| | | | | | | | |||||
| | * | | | | | fix flakes | Matthew Hodgson | 2018-08-12 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | fix typos | Matthew Hodgson | 2018-08-12 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | add a tonne of docstring; make upload_room_keys properly assert version | Matthew Hodgson | 2018-08-12 | 1 | -8/+103 |
| | | | | | | | |||||
| | * | | | | | more docstring for the e2e_room_keys rest | Matthew Hodgson | 2018-08-12 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | fix factoring out of _should_replace_room_key | Matthew Hodgson | 2018-08-12 | 1 | -3/+4 |
| | | | | | | | |||||
| | * | | | | | rename room_key_version table correctly, and fix opt args | Matthew Hodgson | 2018-08-12 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -30/+58 |
| | | | | | | | |||||
| | * | | | | | make /room_keys/version work | Matthew Hodgson | 2018-08-12 | 1 | -7/+11 |
| | | | | | | | |||||
| | * | | | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -5/+42 |
| | | | | | | | |||||
| | * | | | | | make it work and fix pep8 | Matthew Hodgson | 2018-08-12 | 1 | -26/+43 |
| | | | | | | | |||||
| | * | | | | | interim WIP checkin; doesn't build yet | Matthew Hodgson | 2018-08-12 | 1 | -15/+31 |
| | | | | | | | |||||
| | * | | | | | total WIP skeleton for /room_keys API | Matthew Hodgson | 2018-08-12 | 1 | -0/+60 |
| | | | | | | | |||||
* | | | | | | | 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 |
|\| | | | | | | |||||
| * | | | | | | Add description to counter metric | Erik Johnston | 2018-10-10 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Track number of non-empty sync responses instead | Erik Johnston | 2018-10-10 | 1 | -9/+15 |
| | | | | | | | |||||
| * | | | | | | Append _total to metric and fix up spelling | Erik Johnston | 2018-10-10 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Add metric to count lazy member sync requests | Erik Johnston | 2018-10-09 | 1 | -6/+20 |
| | | | | | | | |||||
| * | | | | | | Remove unnecessary extra function call layer | Erik Johnston | 2018-10-08 | 1 | -15/+3 |
| | | | | | | | |||||
| * | | | | | | Use errback pattern and catch async failures | Erik Johnston | 2018-10-08 | 1 | -1/+6 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | 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 | ||||
* | | | | | Fix exception handling in fetching remote profiles | Erik Johnston | 2018-10-03 | 1 | -6/+2 |
| | | | | | |||||
* | | | | | Merge pull request #3989 from matrix-org/rav/better_stacktraces | Richard van der Hoff | 2018-10-02 | 2 | -22/+23 |
|\ \ \ \ \ | | | | | | | | | | | | | Avoid reraise, to improve stacktraces | ||||
| * | | | | | Avoid reraise, to improve stacktraces | Richard van der Hoff | 2018-10-01 | 2 | -22/+23 |
| | | | | | | |||||
* | | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state | Erik Johnston | 2018-10-02 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix lazy loaded sync with rejected state events | ||||
| * | | | | | Fix lazy loaded sync with rejected state events | Erik Johnston | 2018-10-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, we assume that the name and canonical alias events in the state have not been rejected. In practice this may not be the case (though we should probably think about fixing that) so lets ensure that we gracefully handle that case, rather than 404'ing the sync request like we do now. | ||||
* | | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -12/+46 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix exceptions when handling incoming transactions | ||||
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 3 | -5/+21 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Include event when resolving state for missing prevs | Richard van der Hoff | 2018-09-27 | 1 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a forward extremity for a room as `E`, and you receive `A`, `B`, s.t. `A -> B -> E`, and `B` also points to an unknown event `X`, then we need to do state res between `X` and `E`. When that happens, we need to make sure we include `X` in the state that goes into the state res alg. Fixes #3934. | ||||
| * | | | | | Include state from remote servers in pdu handling | Richard van der Hoff | 2018-09-27 | 1 | -4/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we've fetched state events from remote servers in order to resolve the state for a new event, we need to actually pass those events into resolve_events_with_factory (so that it can do the state res) and then persist the ones we need - otherwise other bits of the codebase get confused about why we have state groups pointing to non-existent events. | ||||
| * | | | | | Fix "unhashable type: 'list'" exception in federation handling | Richard van der Hoff | 2018-09-27 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_state_groups returns a map from state_group_id to a list of FrozenEvents, so was very much the wrong thing to be putting as one of the entries in the list passed to resolve_events_with_factory (which expects maps from (event_type, state_key) to event id). We actually want get_state_groups_ids().values() rather than get_state_groups(). This fixes the main problem in #3923, but there are other problems with this bit of code which get discovered once you do so. | ||||
* | | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checks | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | remove spurious federation checks on localhost | ||||
| * | | | | | Fix complete fail to do the right thing | Richard van der Hoff | 2018-09-28 | 1 | -0/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3794 from matrix-org/erikj/faster_typing | Richard van der Hoff | 2018-09-27 | 1 | -3/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Improve performance of getting typing updates for replication | ||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing | Erik Johnston | 2018-09-19 | 10 | -70/+198 |
| |\ \ \ \ \ | |||||
| * | | | | | | Improve performance of getting typing updates for replication | Erik Johnston | 2018-09-05 | 1 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetching the list of all new typing notifications involved iterating over all rooms and comparing their serial. Lets move to using a stream change cache, like we do for other streams. | ||||
* | | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups | Richard van der Hoff | 2018-09-27 | 1 | -2/+10 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Clarifications in FederationHandler | ||||
| * | | | | | | more comments | Richard van der Hoff | 2018-09-27 | 1 | -4/+3 |
| | | | | | | | |||||
| * | | | | | | Clarifications in FederationHandler | Richard van der Hoff | 2018-09-27 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add some comments on things that look a bit bogus * rename this `state` variable to avoid confusion with the `state` used elsewhere in this function. (There was no actual conflict, but it was a confusing bit of spaghetti.) | ||||
* | | | | | | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Replaced all occurences of e.message with str(e) | ||||
| * | | | | | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 2 | -2/+2 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Schnuffle <schnuffle@github.com> | ||||
* | | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2 | Richard van der Hoff | 2018-09-27 | 1 | -0/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Logging improvements | ||||
| * | | | | | | Logging improvements | Richard van der Hoff | 2018-09-26 | 1 | -0/+4 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Some logging tweaks to help with debugging incoming federation transactions | ||||
* / / / / / | Include eventid in log lines when processing incoming federation ↵ | Richard van der Hoff | 2018-09-27 | 1 | -26/+39 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions (#3959) when processing incoming transactions, it can be hard to see what's going on, because we process a bunch of stuff in parallel, and because we may end up recursively working our way through a chain of three or four events. This commit creates a way to use logcontexts to add the relevant event ids to the log lines. | ||||
* | | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu | Amber Brown | 2018-09-26 | 1 | -23/+46 |
|\ \ \ \ \ | | | | | | | | | | | | | Comments and interface cleanup for on_receive_pdu | ||||
| * | | | | | Comments and interface cleanup for on_receive_pdu | Richard van der Hoff | 2018-09-20 | 1 | -23/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some informative comments about what's going on here. Also, `sent_to_us_directly` and `get_missing` were doing the same thing (apart from in `_handle_queued_pdus`, which looks like a bug), so let's get rid of `get_missing` and use `sent_to_us_directly` consistently. | ||||
* | | | | | | Only lazy load self-members on initial sync | Matthew Hodgson | 2018-09-25 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | Given we have disabled lazy loading for incr syncs in #3840, we can make self-LL more efficient by only doing it on initial sync. Also adds a bounds check for if/when we change our mind, so that we don't try to include LL members on sync responses with no timeline. | ||||
* | | | | | | Always LL ourselves if we're in a room to simplify clients (#3916) | Matthew Hodgson | 2018-09-20 | 1 | -0/+4 |
|/ / / / / | | | | | | | | | | | | | | | | Should fix https://github.com/vector-im/riot-web/issues/7209 | ||||
* | / / / | Improve the logging when handling a federation transaction (#3904) | Richard van der Hoff | 2018-09-19 | 1 | -55/+109 |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's try to rationalise the logging that happens when we are processing an incoming transaction, to make it easier to figure out what is going wrong when they take ages. In particular: - make everything start with a [room_id event_id] prefix - make sure we log a warning when catching exceptions rather than just turning them into other, more cryptic, exceptions. | ||||
* | | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout | Amber Brown | 2018-09-19 | 1 | -1/+30 |
|\ \ \ \ | | | | | | | | | | | Bump timeout on get_missing_events request | ||||
| * | | | | Bump timeout on get_missing_events request | Richard van der Hoff | 2018-09-18 | 1 | -1/+30 |
| | | | | | |||||
* | | | | | Use directory server for room joins (#3899) | Richard van der Hoff | 2018-09-18 | 1 | -0/+5 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | When we do a join, always try the server we used for the alias lookup first. Fixes #2418 | ||||
* | | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | don't ratelimit autojoins | ||||
| * | | | | don't ratelimit autojoins | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 1 | -3/+16 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1675 Fixes https://github.com/matrix-org/synapse/issues/2782 | ||||
* | | | | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't filter membership events based on history visibility as we will already have filtered the messages in the timeline, and state events are always visible. and because @erikjohnston said so. | ||||
* | | | | show heroes if a room has a 'deleted' name/canonical_alias (#3851) | Matthew Hodgson | 2018-09-12 | 1 | -2/+15 |
| | | | | |||||
* | | | | argh pep8 | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | correctly log gappy sync metrics | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix logline | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 1 | -30/+88 |
| | | | | | | | | | | | | | | | | | | | | * speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840) | ||||
* | | | | Don't send empty tags list down sync | Erik Johnston | 2018-09-06 | 1 | -0/+5 |
| | | | | |||||
* | | | | Send existing room tags down sync on join | Erik Johnston | 2018-09-06 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user joined a room any existing tags were not sent down the sync stream. Ordinarily this isn't a problem because the user needs to be in the room to have set tags in it, however synapse will sometimes add tags for a user to a room, e.g. for server notices, which need to come down sync. | ||||
* | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 1 | -8/+8 |
|\ \ \ \ | | | | | | | | | | | User iter* during sync state calculations | ||||
| * | | | | User iter* during sync state calculations | Erik Johnston | 2018-09-05 | 1 | -8/+8 |
| |/ / / | |||||
* / / / | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 6 | -19/+22 |
|/ / / | |||||
* | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove unnecessary resolve_events_with_state_map | ||||
| * | | | Remove unnecessary resolve_events_with_state_map | Erik Johnston | 2018-08-22 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | We only ever used the synchronous resolve_events_with_state_map in one place, which is trivial to replace with the async version. | ||||
* | | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -1/+2 |
| | | | |||||
* | | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 1 | -1/+8 |
|/ / | | | | | don't return non-LL-member state in incremental sync state blocks | ||||
* | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 2 | -9/+26 |
|\ \ | | | | | | | Allow profile updates to happen on workers | ||||
| * | | Rename WorkerProfileHandler to BaseProfileHandler | Erik Johnston | 2018-08-22 | 1 | -3/+10 |
| | | | |||||
| * | | Add assert to ensure handler is only run on master | Erik Johnston | 2018-08-22 | 1 | -0/+2 |
| | | | |||||
| * | | Remove redundant vars | Erik Johnston | 2018-08-22 | 1 | -3/+0 |
| | | | |||||
| * | | Add some fixmes | Erik Johnston | 2018-08-17 | 1 | -0/+4 |
| | | | |||||
| * | | Call UserDirectoryHandler methods directly | Erik Johnston | 2018-08-17 | 1 | -21/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the user directory handling is fairly racey as a bunch of stuff assumes that the processing happens on master, which it doesn't when there is a synapse.app.user_dir worker. So lets just call the function directly until we actually get round to fixing it, since it doesn't make the situation any worse. | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-17 | 15 | -84/+409 |
| |\ \ | | | | | | | | | | | | | erikj/split_profiles | ||||
| * | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 1 | -7/+14 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| |\ \ \ | | | | | | | | | | | | | | | | erikj/split_profiles | ||||
| * | | | | Allow profile changes to happen on workers | Erik Johnston | 2018-08-07 | 1 | -5/+21 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-20 | 16 | -109/+445 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | erikj/refactor_state_handler | ||||
| * \ \ \ \ | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix logcontexts for running pushers | ||||
| | * | | | | | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts. | ||||
| * | | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 3 | -8/+25 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 |
| |/ / / / | |||||
| * | | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -1/+34 |
| | | | | | |||||
| * | | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -10/+149 |
| | | | | | |||||
| * | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Fix Mau off by one errors | ||||
| | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 4 | -31/+108 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | * | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | * | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | * \ \ \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -13/+14 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | * \ \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * | | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -12/+76 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 1 | -17/+57 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Move more federation APIs to workers | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 14 | -27/+78 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| | * | | | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function. | ||||
| | * | | | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 1 | -2/+14 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | erikj/split_federation |