Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse ↵ | Brendan Abolivier | 2019-12-04 | 1 | -1/+1 |
|\ | | | | | | | into babolivier/context_filters | ||||
| * | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-11-26 | 125 | -1166/+2323 |
| |\ | |||||
* | \ | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 189 | -1451/+4493 |
|\ \ \ | |||||
| * | | | Add benchmarks for structured logging performance (#6266) | Amber Brown | 2019-12-03 | 7 | -0/+294 |
| | | | | |||||
| * | | | Transfer power level state events on room upgrade (#6237) | Andrew Morgan | 2019-12-02 | 2 | -5/+32 |
| | | | | |||||
| * | | | Use python3 packages for Ubuntu (#6443) | Andrew Morgan | 2019-12-02 | 2 | -2/+3 |
| | | | | |||||
| * | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241) | Filip Štědronský | 2019-12-02 | 2 | -1/+5 |
| | | | | | | | | | | | | Signed-Off-By: Filip Štědronský <g@regnarg.cz> | ||||
| * | | | Add User-Interactive Auth to /account/3pid/add (#6119) | Andrew Morgan | 2019-11-29 | 2 | -0/+6 |
| | | | | |||||
| * | | | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasons | Erik Johnston | 2019-11-29 | 7 | -10/+162 |
| |\ \ \ | | | | | | | | | | | Implement MSC 2367 - Membership Reasons | ||||
| | * | | | Newsfile | Erik Johnston | 2019-11-28 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Add tests | Erik Johnston | 2019-11-28 | 1 | -0/+140 |
| | | | | | |||||
| | * | | | Propagate reason in remotely rejected invites | Erik Johnston | 2019-11-28 | 4 | -9/+20 |
| | | | | | |||||
| | * | | | MSC2367 Allow reason field on all member events | Erik Johnston | 2019-11-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #6436 from matrix-org/babolivier/fix-state-retrieval | Brendan Abolivier | 2019-11-29 | 3 | -9/+20 |
| |\ \ \ \ | | | | | | | | | | | | | Discard retention policies when retrieving state | ||||
| | * | | | | Lint | Brendan Abolivier | 2019-11-28 | 1 | -4/+8 |
| | | | | | | |||||
| | * | | | | Changelog | Brendan Abolivier | 2019-11-28 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-28 | 2 | -9/+15 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state. | ||||
| * | | | | blacklist more tests | Richard van der Hoff | 2019-11-28 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-11-28 | 3 | -1/+22 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | 1.6.1 v1.6.1 github/release-v1.6.1 release-v1.6.1 | Andrew Morgan | 2019-11-28 | 5 | -3/+22 |
| | | | | | |||||
| | * | | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 3 | -0/+17 |
| | | | | | |||||
| | * | | | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-27 | 3 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Guess I only tested this on python 2 :/ Fixes #6419. | ||||
| * | | | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 3 | -0/+17 |
| | | | | | |||||
| * | | | | Clarifications for the email configuration settings. (#6423) | Richard van der Hoff | 2019-11-28 | 3 | -2/+33 |
| | | | | | | | | | | | | | | | Cf #6422 | ||||
| * | | | | Implementation of MSC2314 (#6176) | Amber Brown | 2019-11-28 | 13 | -65/+174 |
| | | | | | |||||
| * | | | | add etag and count to key backup endpoints (#5858) | Hubert Chathi | 2019-11-27 | 7 | -124/+297 |
| | | | | | |||||
| * | | | | Add more tests to the worker blacklist (#6429) | Richard van der Hoff | 2019-11-27 | 2 | -0/+30 |
| | | | | | |||||
| * | | | | Merge pull request #6358 from matrix-org/babolivier/message_retention | Brendan Abolivier | 2019-11-27 | 13 | -8/+1055 |
| |\ \ \ \ | | | | | | | | | | | | | Implement message retention policies (MSC1763) | ||||
| | * \ \ \ | Merge branch 'develop' into babolivier/message_retention | Brendan Abolivier | 2019-11-26 | 138 | -1274/+2600 |
| | |\ \ \ \ | |||||
| | * | | | | | Don't restrict the tests to v1 rooms | Brendan Abolivier | 2019-11-26 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Fix worker mode | Brendan Abolivier | 2019-11-19 | 1 | -56/+56 |
| | | | | | | | |||||
| | * | | | | | Fix 3PID invite exchange | Brendan Abolivier | 2019-11-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Lint again | Brendan Abolivier | 2019-11-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Lint again | Brendan Abolivier | 2019-11-19 | 2 | -11/+3 |
| | | | | | | | |||||
| | * | | | | | Lint | Brendan Abolivier | 2019-11-19 | 4 | -101/+77 |
| | | | | | | | |||||
| | * | | | | | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 2 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy. | ||||
| | * | | | | | Implement per-room message retention policies | Brendan Abolivier | 2019-11-04 | 13 | -6/+1074 |
| | | | | | | | |||||
| * | | | | | | clean up buildkite output | Richard van der Hoff | 2019-11-26 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Remove assertion and provide a clear warning on startup for missing ↵ | Andrew Morgan | 2019-11-26 | 4 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | public_baseurl (#6379) | ||||
| * | | | | | | Merge pull request #6343 from matrix-org/rav/event_auth/4 | Richard van der Hoff | 2019-11-26 | 2 | -37/+45 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor _update_auth_events_and_context_for_auth | ||||
| | * | | | | | | remove confusing fixme | Richard van der Hoff | 2019-11-26 | 1 | -6/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4 | Richard van der Hoff | 2019-11-18 | 30 | -47/+85 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | newsfile | Richard van der Hoff | 2019-11-08 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Use get_events_as_list rather than lots of calls to get_event | Richard van der Hoff | 2019-11-08 | 1 | -16/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's more efficient and clearer. | ||||
| | * | | | | | | | Update some docstrings and comments | Richard van der Hoff | 2019-11-08 | 1 | -8/+31 |
| | | | | | | | | | |||||
| | * | | | | | | | Simplify _update_auth_events_and_context_for_auth | Richard van der Hoff | 2019-11-08 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move event_key calculation into _update_context_for_auth_events, since it's only used there. | ||||
| * | | | | | | | | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-26 | 3 | -4/+5 |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guess I only tested this on python 2 :/ Fixes #6419. | ||||
| * | | | | | | | Merge pull request #6420 from ↵ | Erik Johnston | 2019-11-26 | 2 | -12/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/erikj/fix_find_next_generated_user_id_localpart Fix guest registration | ||||
| | * | | | | | | | Don't construct a set | Erik Johnston | 2019-11-26 | 1 | -6/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Newsfile | Erik Johnston | 2019-11-26 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix find_next_generated_user_id_localpart | Erik Johnston | 2019-11-26 | 1 | -10/+7 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-11-26 | 4 | -2/+17 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | 1.6.0 v1.6.0 github/release-v1.6.0 release-v1.6.0 | Andrew Morgan | 2019-11-26 | 4 | -2/+16 |
| | | | | | | | | |||||
| | * | | | | | | Fix phone home stats (#6418) | Erik Johnston | 2019-11-26 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix phone home stats | ||||
| * | | | | | | | Prevent account_data content from being sent over TCP replication (#6333) | Andrew Morgan | 2019-11-26 | 3 | -7/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-11-14 | 5 | -2/+6 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anoa/fix_account_data_sync * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5 | ||||
| | * | | | | | | | | lint | Andrew Morgan | 2019-11-08 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add changelog | Andrew Morgan | 2019-11-08 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Remove content from being sent for account data rdata stream | Andrew Morgan | 2019-11-08 | 2 | -6/+6 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fix | Erik Johnston | 2019-11-26 | 4 | -4/+99 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | Fix caching devices for remote servers in worker. | ||||
| | * | | | | | | | Fixup docs | Erik Johnston | 2019-11-26 | 2 | -2/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Newsfile | Erik Johnston | 2019-11-05 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix caching devices for remote servers in worker. | Erik Johnston | 2019-11-05 | 3 | -4/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `/keys/query` API is hit on client_reader worker Synapse may decide that it needs to resync some remote deivces. Usually this happens on master, and then gets cached. However, that fails on workers and so it falls back to fetching devices from remotes directly, which may in turn fail if the remote is down. | ||||
| * | | | | | | | | Make sure that we close cursors before returning from a query (#6408) | Richard van der Hoff | 2019-11-25 | 3 | -10/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are lots of words in the comment as to why this is a good idea. Fixes #6403. | ||||
| * | | | | | | | | Merge tag 'v1.6.0rc2' into develop | Richard van der Hoff | 2019-11-25 | 3 | -19/+35 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.6.0rc2 (2019-11-25) ============================= Bugfixes -------- - Fix a bug which could cause the background database update hander for event labels to get stuck in a loop raising exceptions. ([\#6407](https://github.com/matrix-org/synapse/issues/6407)) | ||||
| | * | | | | | | | 1.6.0rc2 v1.6.0rc2 | Richard van der Hoff | 2019-11-25 | 3 | -2/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix exceptions from background database update for event labels. (#6407) | Richard van der Hoff | 2019-11-25 | 2 | -18/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some exception handling here so that events whose json cannot be parsed are ignored rather than getting us stuck in a loop. Fixes #6404. | ||||
| * | | | | | | | | Improve the performance of structured logging (#6322) | Amber Brown | 2019-11-26 | 4 | -30/+93 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6392 from matrix-org/babolivier/fix-1623 | Brendan Abolivier | 2019-11-25 | 2 | -0/+75 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Test if a purge can make /messages return 500 responses | ||||
| | * | | | | | | | | Lint | Brendan Abolivier | 2019-11-20 | 1 | -6/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Changelog | Brendan Abolivier | 2019-11-20 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Test if a purge can make /messages return 500 responses | Brendan Abolivier | 2019-11-20 | 1 | -0/+72 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add working build command for docker image (#6390) | Andrew Morgan | 2019-11-23 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add working build command for docker image * Add changelog | ||||
| * | | | | | | | | | Fix link to user_dir_populate.sql in the user directory docs (#6388) | Aaron Raimist | 2019-11-21 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Clean up newline quote marks around the codebase (#6362) | Andrew Morgan | 2019-11-21 | 26 | -46/+43 |
| | | | | | | | | | | |||||
| * | | | | | | | | | update macOS installation instructions | Matthew Hodgson | 2019-11-20 | 1 | -2/+10 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | 1.6.0rc1 v1.6.0rc1 | Andrew Morgan | 2019-11-20 | 62 | -61/+75 |
| | | | | | | | | | |||||
| * | | | | | | | | Docker: Change permissions for data dir before attempting to write to it (#6389) | Andrew Morgan | 2019-11-20 | 2 | -3/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Move admin endpoints into separate files (#6308) | Manuel Stahl | 2019-11-20 | 5 | -555/+622 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups | Brendan Abolivier | 2019-11-20 | 3 | -70/+126 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | Only do `rc_login` ratelimiting on succesful login. | ||||
| | * | | | | | | | Lint | Brendan Abolivier | 2019-11-20 | 1 | -1/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Apply suggestions from code review | Erik Johnston | 2019-11-18 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> | ||||
| | * | | | | | | | Newsfile | Erik Johnston | 2019-11-06 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Add failed auth ratelimiting to UIA | Erik Johnston | 2019-11-06 | 1 | -1/+32 |
| | | | | | | | | | |||||
| | * | | | | | | | Only do `rc_login` ratelimiting on succesful login. | Erik Johnston | 2019-11-06 | 2 | -72/+94 |
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing this in a number of places which meant that some login code paths incremented the counter multiple times. It was also applying ratelimiting to UIA endpoints, which was probably not intentional. In particular, some custom auth modules were calling `check_user_exists`, which incremented the counters, meaning that people would fail to login sometimes. | ||||
| * | | | | | | | Replace UPDATE with UPSERT on device_max_stream_id table (#6363) | Andrew Morgan | 2019-11-15 | 2 | -2/+16 |
| | | | | | | | | |||||
| * | | | | | | | Add optional python dependencies to snap packaging (#6317) | James | 2019-11-14 | 2 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Hebden <james@ec0.io> | ||||
| * | | | | | | | Fix guest -> real account upgrade with account validity enabled (#6359) | Andrew Morgan | 2019-11-14 | 2 | -6/+4 |
| | | | | | | | | |||||
| * | | | | | | | Replace instance variations of homeserver with correct case/spacing (#6357) | Andrew Morgan | 2019-11-14 | 21 | -37/+38 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-11-14 | 5 | -2/+6 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anoa/homeserver_copy * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5 | ||||
| * | | | | | | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 | Brendan Abolivier | 2019-11-14 | 3 | -2/+3 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Set room version default to 5 | ||||
| | * | | | | | | Set room version default to 5 | Neil Johnson | 2019-10-19 | 3 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | Blacklist PurgeRoomTestCase (#6361) | Andrew Morgan | 2019-11-13 | 2 | -0/+3 |
| | |_|_|/ / / | |/| | | | | | |||||
| | | * | | | | sample config | Andrew Morgan | 2019-11-12 | 1 | -4/+4 |
| | | | | | | | |||||
| | | * | | | | Add changelog | Andrew Morgan | 2019-11-12 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | A couple more instances | Andrew Morgan | 2019-11-12 | 2 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Replace instance variations of homeserver with correct case/spacing | Andrew Morgan | 2019-11-12 | 18 | -31/+31 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #6340 from matrix-org/babolivier/pagination_query | Brendan Abolivier | 2019-11-08 | 2 | -8/+33 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix the SQL SELECT query in _paginate_room_events_txn | ||||
| | * | | | | | Incorporate review | Brendan Abolivier | 2019-11-08 | 1 | -12/+12 |
| | | | | | | | |||||
| | * | | | | | Lint | Brendan Abolivier | 2019-11-07 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Only join on event_labels if we're filtering on labels | Brendan Abolivier | 2019-11-07 | 1 | -9/+24 |
| | | | | | | | |||||
| | * | | | | | Handle lack of filter | Brendan Abolivier | 2019-11-07 | 1 | -5/+3 |
| | | | | | | | |||||
| | * | | | | | Changelog | Brendan Abolivier | 2019-11-07 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Fix the SQL SELECT query in _paginate_room_events_txn | Brendan Abolivier | 2019-11-07 | 1 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a SELECT DISTINCT when paginating is quite expensive, because it requires the engine to do sorting on the entire events table. However, we only need to run it if we're filtering on 2+ labels, so this PR is changing the request so that DISTINCT is only used then. | ||||
| * | | | | | | Merge pull request #6295 from matrix-org/erikj/split_purge_history | Erik Johnston | 2019-11-08 | 8 | -182/+335 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Split purge API into events vs state and add PurgeEventsStorage | ||||
| | * | | | | | | Move type annotation into docstring | Erik Johnston | 2019-11-08 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Fix deleting state groups during room purge. | Erik Johnston | 2019-11-06 | 2 | -14/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix the tests to actually test that things got deleted. | ||||
| | * | | | | | | Use correct type annotation | Erik Johnston | 2019-11-06 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-05 | 5 | -83/+146 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| | * | | | | | | | Change to not require a state_groups.room_id index. | Erik Johnston | 2019-11-04 | 4 | -53/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does mean that we won't clean up orphaned state groups (i.e. state groups that were persisted but the associated event wasn't). | ||||
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-11-04 | 96 | -369/+2050 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| | * | | | | | | | | Fix up comment | Erik Johnston | 2019-11-01 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Update log line to lie a little less | Erik Johnston | 2019-10-31 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add state_groups.room_id index | Erik Johnston | 2019-10-31 | 2 | -0/+24 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Docstrings | Erik Johnston | 2019-10-31 | 1 | -3/+11 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix purge room API | Erik Johnston | 2019-10-31 | 1 | -5/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-31 | 94 | -282/+781 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_purge_history | ||||
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-10-30 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Split purge API into events vs state | Erik Johnston | 2019-10-30 | 6 | -184/+308 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-07 | 3 | -0/+81 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MSC2326: Add background update to take previous events into account | ||||
| | * | | | | | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.py | Brendan Abolivier | 2019-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| | * | | | | | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.py | Brendan Abolivier | 2019-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| | * | | | | | | | | | | Copy results | Brendan Abolivier | 2019-11-07 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Revert "Back to using cursor_to_dict" | Brendan Abolivier | 2019-11-07 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1186612d6cd728e6b7ed7806579db3cea7410b54. | ||||
| | * | | | | | | | | | | Back to using cursor_to_dict | Brendan Abolivier | 2019-11-07 | 1 | -9/+9 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Initialise value before looping | Brendan Abolivier | 2019-11-07 | 1 | -4/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Incorporate review | Brendan Abolivier | 2019-11-07 | 1 | -14/+9 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix field name | Brendan Abolivier | 2019-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Update insert | Brendan Abolivier | 2019-11-06 | 1 | -1/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Update changelog | Brendan Abolivier | 2019-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-04 | 10 | -93/+256 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Print out the actual number of affected rows | Brendan Abolivier | 2019-11-04 | 1 | -4/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Correctly order results | Brendan Abolivier | 2019-11-04 | 1 | -5/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | TODO | Brendan Abolivier | 2019-11-04 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix exit condition | Brendan Abolivier | 2019-11-04 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Lint | Brendan Abolivier | 2019-11-04 | 1 | -6/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Changelog | Brendan Abolivier | 2019-11-04 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Don't try to process events we already have a label for | Brendan Abolivier | 2019-11-04 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Use a sensible default value for labels | Brendan Abolivier | 2019-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Use the right format for rows | Brendan Abolivier | 2019-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | MSC2326: Add background update to take previous events into account | Brendan Abolivier | 2019-11-04 | 2 | -0/+72 |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Python 3.8 for tox (#6341) | Richard van der Hoff | 2019-11-07 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and update INSTALL.md to include py3.8. We'll also have to update the buildkite pipeline to run it | ||||
| * | | | | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups | Andrew Morgan | 2019-11-07 | 4 | -1/+30 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Andrew Morgan | 2019-11-04 | 5 | -83/+146 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | anoa/room_upgrade_groups | ||||
| | * | | | | | | | | | | Re-add docstring, with caveats detailed | Andrew Morgan | 2019-11-04 | 3 | -3/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Transfer upgraded rooms on groups | Andrew Morgan | 2019-11-04 | 3 | -0/+25 |
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | tweak changelog | Richard van der Hoff | 2019-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix LruCache callback deduplication (#6213) | V02460 | 2019-11-07 | 2 | -11/+38 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking ↵ | Andrew Morgan | 2019-11-06 | 4 | -21/+40 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6338) | ||||
| | * | | | | | | | | | | raise exception after multiple failures | Andrew Morgan | 2019-11-06 | 1 | -3/+10 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Address review comments | Andrew Morgan | 2019-11-06 | 2 | -13/+13 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add changelog | Andrew Morgan | 2019-11-06 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Don't forget to ratelimit calls outside of RegistrationHandler | Andrew Morgan | 2019-11-06 | 2 | -2/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Numeric ID checker now checks @0, don't ratelimit on checking | Andrew Morgan | 2019-11-06 | 2 | -20/+29 |
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-11-06 | 6 | -3/+18 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'release-v1.5.1' | Richard van der Hoff | 2019-11-06 | 6 | -2/+73 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | build debs for eoan and bullseye github/release-v1.5.1 release-v1.5.1 | Richard van der Hoff | 2019-11-06 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | 1.5.1 v1.5.1 | Richard van der Hoff | 2019-11-06 | 5 | -3/+16 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ↵ | Richard van der Hoff | 2019-11-06 | 7 | -103/+285 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6320) Fixes a bug where rejected events were persisted with the wrong state group. Also fixes an occasional internal-server-error when receiving events over federation which are rejected and (possibly because they are backwards-extremities) have no prev_group. Fixes #6289. | ||||
| * | | | | | | | | | | | Add some checks that we aren't using state from rejected events (#6330) | Richard van der Hoff | 2019-11-05 | 3 | -6/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Raise an exception if accessing state for rejected events Add some sanity checks on accessing state_group etc for rejected events. * Skip calculating push actions for rejected events It didn't actually cause any bugs, because rejected events get filtered out at various later points, but there's not point in trying to calculate the push actions for a rejected event. | ||||
| * | | | | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats | Erik Johnston | 2019-11-05 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix phone home stats | ||||
| | * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-11-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix phone home stats | Erik Johnston | 2019-11-05 | 1 | -2/+2 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2 | Richard van der Hoff | 2019-11-05 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | Fix exception when OpenGraph tag values are ints | ||||
| | * | | | | | | | | | | Fix exception when OpenGraph tag values are ints | Richard van der Hoff | 2019-11-05 | 2 | -1/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 3 | -1/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | Strip overlong OpenGraph data from url preview | ||||
| | * | | | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 231 | -1824/+4529 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / / | |||||
| * | | | / / / / / / | Improve documentation for EventContext fields (#6319) | Richard van der Hoff | 2019-11-05 | 3 | -26/+69 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Apply suggestions from code review | Richard van der Hoff | 2019-11-05 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| | * | | | | | | | | Strip overlong OpenGraph data from url preview | Richard van der Hoff | 2019-11-05 | 3 | -1/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to stop people causing DoSes with malicious web pages | ||||
* | | | | | | | | | | Incorporate review | Brendan Abolivier | 2019-12-04 | 3 | -3/+2 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Format changelog | Brendan Abolivier | 2019-11-20 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Update changelog since this isn't going to be featured in 1.6.0 | Brendan Abolivier | 2019-11-20 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Also filter state events | Brendan Abolivier | 2019-11-06 | 1 | -1/+7 |
| | | | | | | | | | |||||
* | | | | | | | | | Only filter if a filter was provided | Brendan Abolivier | 2019-11-05 | 1 | -4/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Update copyright | Brendan Abolivier | 2019-11-05 | 1 | -1/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Lint | Brendan Abolivier | 2019-11-05 | 1 | -30/+41 |
| | | | | | | | | | |||||
* | | | | | | | | | Update copyrights | Brendan Abolivier | 2019-11-05 | 8 | -2/+21 |
| | | | | | | | | | |||||
* | | | | | | | | | Changelog | Brendan Abolivier | 2019-11-05 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Add tests for /search | Brendan Abolivier | 2019-11-05 | 1 | -44/+143 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge labels tests for /context and /messages | Brendan Abolivier | 2019-11-05 | 1 | -146/+130 |
| | | | | | | | | | |||||
* | | | | | | | | | Add test case | Brendan Abolivier | 2019-11-05 | 1 | -0/+182 |
| | | | | | | | | | |||||
* | | | | | | | | | Filter events_before and events_after in /context requests | Brendan Abolivier | 2019-11-05 | 1 | -2/+4 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | While the current version of the spec doesn't say much about how this endpoint uses filters (see https://github.com/matrix-org/matrix-doc/issues/2338), the current implementation is that some fields of an EventFilter apply (the ones that are used when running the SQL query) and others don't (the ones that are used by the filter itself) because we don't call event_filter.filter(...). This seems counter-intuitive and probably not what we want so this commit fixes it. | ||||
* | | / / / / / | Remove the psutil dependency (#6318) | Amber Brown | 2019-11-05 | 5 | -83/+146 |
| |_|/ / / / / |/| | | | | | | | | | | | | | * remove psutil and replace with resource | ||||
* | | | | | | | document the REPLICATE command a bit better (#6305) | Richard van der Hoff | 2019-11-04 | 5 | -10/+110 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | since I found myself wonder how it works | ||||
* | | | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 11 | -9/+396 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Implement MSC2326 (label based filtering) | ||||
| * | | | | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 7 | -15/+21 |
| | | | | | | | |||||
| * | | | | | | Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sql | Brendan Abolivier | 2019-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | | | | Add more data to the event_labels table and fix the indexes | Brendan Abolivier | 2019-11-01 | 3 | -5/+21 |
| | | | | | | | |||||
| * | | | | | | Add unstable feature flag | Brendan Abolivier | 2019-11-01 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Lint | Brendan Abolivier | 2019-11-01 | 2 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 7 | -21/+34 |
| | | | | | | | |||||
| * | | | | | | Lint | Brendan Abolivier | 2019-10-30 | 4 | -50/+35 |
| | | | | | | | |||||
| * | | | | | | Changelog | Brendan Abolivier | 2019-10-30 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Add integration tests for /messages | Brendan Abolivier | 2019-10-30 | 1 | -1/+101 |
| | | | | | | | |||||
| * | | | | | | Add more integration testing | Brendan Abolivier | 2019-10-30 | 2 | -7/+40 |
| | | | | | | | |||||
| * | | | | | | Add integration tests for sync | Brendan Abolivier | 2019-10-30 | 2 | -5/+122 |
| | | | | | | | |||||
| * | | | | | | Add unit tests | Brendan Abolivier | 2019-10-30 | 2 | -1/+52 |
| | | | | | | | |||||
| * | | | | | | Add index on label | Brendan Abolivier | 2019-10-30 | 1 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Implement filtering | Brendan Abolivier | 2019-10-30 | 2 | -2/+20 |
| | | | | | | | |||||
| * | | | | | | Store labels for new events | Brendan Abolivier | 2019-10-30 | 2 | -1/+22 |
| | | | | | | | |||||
| * | | | | | | Add database table for keeping track of labels on events | Brendan Abolivier | 2019-10-29 | 1 | -0/+20 |
| | | | | | | | |||||
* | | | | | | | Factor out an _AsyncEventContextImpl (#6298) | Richard van der Hoff | 2019-11-01 | 4 | -85/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention here is to make it clearer which fields we can expect to be populated when: notably, that the _event_type etc aren't used for the synchronous impl of EventContext. | ||||
* | | | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schema | Hubert Chathi | 2019-11-01 | 2 | -0/+43 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix hidden field in devices table for older sqlite | ||||
| * | | | | | | | add changelog | Hubert Chathi | 2019-10-31 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix hidden field in devices table for older sqlite | Hubert Chathi | 2019-10-31 | 1 | -0/+42 |
| | | | | | | | | |||||
* | | | | | | | | Add contributer docs for using the provided linters script (#6164) | Jason Robinson | 2019-11-02 | 3 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add lint dependencies black, flake8 and isort These are required when running the `lint.sh` dev scripts. Signed-off-by: Jason Robinson <jasonr@matrix.org> * Add contributer docs for using the providers linters script Add also to the pull request template to avoid build failures due to people not knowing that linters need running. Signed-off-by: Jason Robinson <jasonr@matrix.org> * Fix mention of linter errors correction Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Add mention for installing linter dependencies Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Remove linters from python dependencies as per PR review Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 16 | -12/+812 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198. | ||||
* | | | | | | | | Remove last usages of deprecated logging.warn method (#6314) | Andrew Morgan | 2019-11-01 | 3 | -3/+4 |
| | | | | | | | | |||||
* | | | | | | | | Document lint.sh & allow application to specified files only (#6312) | Neil Pilgrim | 2019-11-01 | 3 | -3/+20 |
| | | | | | | | | |||||
* | | | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232) | Andrew Morgan | 2019-11-01 | 5 | -30/+92 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3 | Hubert Chathi | 2019-10-31 | 7 | -47/+241 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Cross-signing [4/4] -- federation edition | ||||
| * | | | | | | | Update synapse/storage/data_stores/main/devices.py | Hubert Chathi | 2019-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-31 | 129 | -452/+1036 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-31 | 6 | -3/+59 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | make notification of signatures work with workers | ||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-31 | 122 | -448/+973 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | clean up code a bit | Hubert Chathi | 2019-10-31 | 1 | -5/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | make user signatures a separate stream | Hubert Chathi | 2019-10-30 | 5 | -14/+50 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-30 | 95 | -1233/+1682 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| * | | | | | | | | | add changelog | Hubert Chathi | 2019-10-24 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | make notification of signatures work with workers | Hubert Chathi | 2019-10-24 | 3 | -2/+17 |
| | | | | | | | | | | |||||
* | | | | | | | | | | rstrip slashes from url on appservice (#6306) | Will Hunt | 2019-10-31 | 2 | -1/+4 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 41 | -166/+191 |
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | * update version of black and also fix the mypy config being overridden | ||||
* | | | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 23 | -116/+453 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add StateGroupStorage interface | ||||
| * | | | | | | | | Apply suggestions from code review | Erik Johnston | 2019-10-31 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docstring Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | ||||
| * | | | | | | | | Newsfile | Erik Johnston | 2019-10-30 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Port to use state storage | Erik Johnston | 2019-10-30 | 19 | -115/+216 |
| | | | | | | | | | |||||
| * | | | | | | | | Add StateGroupStorage interface | Erik Johnston | 2019-10-30 | 3 | -1/+235 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Expose some homeserver functionality to spam checkers (#6259) | Travis Ralston | 2019-10-31 | 3 | -1/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Offer the homeserver instance to the spam checker * Newsfile * Linting * Expose a Spam Checker API instead of passing the homeserver object * Alter changelog * s/hs/api | ||||
* | | | | | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_room | Erik Johnston | 2019-10-31 | 4 | -2/+84 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix /purge_room admin API | ||||
| * | | | | | | | | Newsfile | Erik Johnston | 2019-10-31 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add unit test for /purge_room API | Erik Johnston | 2019-10-31 | 2 | -1/+83 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix /purge_room API. | Erik Johnston | 2019-10-31 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fails trying to clean the `topic` table which was recently removed. | ||||
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-10-31 | 3 | -9/+13 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Update email section of INSTALL.md about account_threepid_delegates (#6272) | Andrew Morgan | 2019-10-30 | 2 | -7/+10 |
| | | | | | | | | |||||
| * | | | | | | | Clarify environment variable usage when running in Docker (#6181) | Anton Lazarev | 2019-10-30 | 1 | -2/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 65 | -149/+164 |
| | | | | | | | | | | | | | | | | | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated. | ||||
* | | | | | | | fix delete_existing for _persist_events (#6300) | Richard van der Hoff | 2019-10-30 | 3 | -5/+3 |
| |/ / / / / |/| | | | | | | | | | | | this is part of _retry_on_integrity_error, so should only be on _persist_events_and_state_updates | ||||
| | | * | | | rename get_devices_by_remote to get_device_updates_by_remote | Hubert Chathi | 2019-10-30 | 4 | -14/+14 |
| | | | | | | |||||
| | | * | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-30 | 94 | -1166/+1615 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_store | Erik Johnston | 2019-10-30 | 18 | -667/+818 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move persist_events out from main data store. | ||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-10-30 | 146 | -722/+1245 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | erikj/split_out_persistence_store | ||||
* | | | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptor | Erik Johnston | 2019-10-30 | 4 | -7/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make ObservableDeferred.observe() always return deferred. | ||||
| * | | | | | | | Clarify docstring | Erik Johnston | 2019-10-30 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-10-30 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Make ObservableDeferred.observe() always return deferred. | Erik Johnston | 2019-10-30 | 3 | -8/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to use in an async/await world. Also fixes a bug where cache descriptors would occaisonally return a raw value rather than a deferred. | ||||
* | | | | | | | | Modify doc to update Google ReCaptcha terms (#6257) | Yash Jipkate | 2019-10-30 | 2 | -3/+4 |
| | | | | | | | | |||||
* | | | | | | | | Fix log line that was printing undefined value (#6278) | Andrew Morgan | 2019-10-30 | 2 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Update CI to run isort on scripts and scripts-dev (#6270) | Andrew Morgan | 2019-10-30 | 3 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Fix small typo in comment (#6269) | Andrew Morgan | 2019-10-30 | 2 | -1/+2 |
|/ / / / / / / |