| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2022-03-29 | 1 | -24/+47 |
|\ |
|
| * | Remove unused `auth_event_ids` argument plumbing (#12304) | Eric Eastwood | 2022-03-29 | 1 | -8/+0 |
| * | Refactor `create_new_client_event` to use a new parameter, `state_event_ids`,... | Eric Eastwood | 2022-03-25 | 1 | -16/+47 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Patrick Cloke | 2022-03-10 | 1 | -1/+4 |
|\| |
|
| * | Support stable identifiers for MSC3440: Threading (#12151) | Patrick Cloke | 2022-03-10 | 1 | -1/+4 |
| | | |
| \ | |
*-. \ | Merge branch 'release-v1.54', remote-tracking branch 'origin' into matrix-org... | Olivier Wilkinson (reivilibre) | 2022-03-08 | 1 | -0/+3 |
|\ \ \
| | |/
| |/| |
|
| * | | Limit the size of the aggregation_key (#12101) | Erik Johnston | 2022-03-03 | 1 | -0/+3 |
| |/ |
|
* | | Merge commit 'd8001' (pre v1.54.0rc1) into matrix-org-hotfixes | Olivier Wilkinson (reivilibre) | 2022-03-02 | 1 | -4/+6 |
|\| |
|
| * | Faster joins: persist to database (#12012) | Richard van der Hoff | 2022-03-01 | 1 | -0/+2 |
| * | Improve exception handling for concurrent execution (#12109) | Richard van der Hoff | 2022-03-01 | 1 | -2/+2 |
| * | Remove `HomeServer.get_datastore()` (#12031) | Richard van der Hoff | 2022-02-23 | 1 | -2/+2 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2022-02-22 | 1 | -4/+6 |
|\| |
|
| * | Minor typing fixes (#12034) | Richard van der Hoff | 2022-02-21 | 1 | -4/+6 |
* | | Merge branch 'release-v1.53' into matrix-org-hotfixes | Sean Quah | 2022-02-15 | 1 | -4/+16 |
|\| |
|
| * | Fix historical messages backfilling in random order on remote homeservers (MS... | Eric Eastwood | 2022-02-07 | 1 | -4/+16 |
* | | Printf debugging for MSISDN validation (#11882) | David Robertson | 2022-02-08 | 1 | -2/+2 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2022-01-19 | 1 | -1/+1 |
|\| |
|
| * | Bundle aggregations outside of the serialization method. (#11612) | Patrick Cloke | 2022-01-07 | 1 | -1/+1 |
* | | Merge branch 'release-v1.50' into matrix-org-hotfixes | Olivier Wilkinson (reivilibre) | 2022-01-05 | 1 | -13/+24 |
|\| |
|
| * | Do not attempt to bundled aggregations for /members and /state. (#11623) | Patrick Cloke | 2021-12-29 | 1 | -3/+1 |
| * | Do not bundle aggregations for APIs which shouldn't include them. (#11592) | Patrick Cloke | 2021-12-20 | 1 | -1/+3 |
| * | Add missing type hints to `synapse.logging.context` (#11556) | Sean Quah | 2021-12-14 | 1 | -7/+6 |
| * | Allow events to be created with no `prev_events` (MSC2716) (#11243) | Eric Eastwood | 2021-12-10 | 1 | -6/+18 |
* | | Merge branch 'release-v1.49' into matrix-org-hotfixes | Sean Quah | 2021-12-07 | 1 | -7/+1 |
|\| |
|
| * | Include bundled aggregations in /sync and related fixes (#11478) | Patrick Cloke | 2021-12-06 | 1 | -7/+1 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Brendan Abolivier | 2021-11-25 | 1 | -7/+49 |
|\| |
|
| * | Refactor the code to inject bundled relations during serialization. (#11408) | Patrick Cloke | 2021-11-23 | 1 | -1/+1 |
| * | Do not allow MSC3440 threads to fork threads (#11161) | Patrick Cloke | 2021-11-18 | 1 | -6/+48 |
* | | Merge branch 'release-v1.47' into matrix-org-hotfixes | Olivier Wilkinson (reivilibre) | 2021-11-09 | 1 | -7/+16 |
|\| |
|
| * | Rename to more clear `get_insertion_event_id_by_batch_id` (MSC2716) (#11244) | Eric Eastwood | 2021-11-08 | 1 | -1/+1 |
| * | Add remaining type hints to `synapse.events`. (#11098) | Patrick Cloke | 2021-11-02 | 1 | -4/+10 |
| * | Implement an `on_new_event` callback (#11126) | Brendan Abolivier | 2021-10-26 | 1 | -3/+6 |
* | | Merge branch 'release-v1.46' of github.com:matrix-org/synapse into matrix-org... | Sean Quah | 2021-10-26 | 1 | -23/+34 |
|\| |
|
| * | Resolve and share `state_groups` for all historical events in batch (MSC2716)... | Eric Eastwood | 2021-10-13 | 1 | -23/+34 |
* | | Merge branch 'release-v1.45' into matrix-org-hotfixes | Brendan Abolivier | 2021-10-12 | 1 | -18/+68 |
|\| |
|
| * | Remove the deprecated BaseHandler. (#11005) | Patrick Cloke | 2021-10-08 | 1 | -5/+2 |
| * | Merge tag 'v1.44.0rc2' into develop | Olivier Wilkinson (reivilibre) | 2021-09-30 | 1 | -9/+4 |
| |\ |
|
| * | | Split `event_auth.check` into two parts (#10940) | Richard van der Hoff | 2021-09-29 | 1 | -2/+4 |
| * | | Use direct references for configuration variables (part 6). (#10916) | Patrick Cloke | 2021-09-29 | 1 | -6/+8 |
| * | | Use `RoomVersion` objects (#10934) | Richard van der Hoff | 2021-09-29 | 1 | -6/+21 |
| * | | Ensure `(room_id, next_batch_id)` is unique to avoid cross-talk/conflicts bet... | Eric Eastwood | 2021-09-28 | 1 | -0/+34 |
* | | | Merge branch 'release-v1.44' into matrix-org-hotfixes | Olivier Wilkinson (reivilibre) | 2021-09-30 | 1 | -9/+4 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix event context for outliers in important MSC2716 spot (#10938) | Eric Eastwood | 2021-09-30 | 1 | -9/+4 |
| |/ |
|
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-09-28 | 1 | -8/+8 |
|\| |
|
| * | Use direct references for configuration variables (part 5). (#10897) | Patrick Cloke | 2021-09-24 | 1 | -4/+4 |
| * | Use direct references for some configuration variables (part 3) (#10885) | Patrick Cloke | 2021-09-23 | 1 | -2/+2 |
| * | Remove unnecessary parentheses around tuples returned from methods (#10889) | Andrew Morgan | 2021-09-23 | 1 | -2/+2 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | David Robertson | 2021-09-22 | 1 | -9/+13 |
|\| |
|
| * | Rename MSC2716 things from `chunk` to `batch` to match `/batch_send` endpoint... | Eric Eastwood | 2021-09-21 | 1 | -1/+1 |
| * | Require type hints in the handlers module. (#10831) | Patrick Cloke | 2021-09-20 | 1 | -8/+12 |
* | | Merge branch 'release-v1.43' of github.com:matrix-org/synapse into matrix-org... | Andrew Morgan | 2021-09-14 | 1 | -2/+2 |
|\| |
|
| * | Use direct references for some configuration variables (#10798) | Patrick Cloke | 2021-09-13 | 1 | -2/+2 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-09-10 | 1 | -5/+50 |
|\| |
|
| * | Move `maybe_kick_guest_users` out of `BaseHandler` (#10744) | Richard van der Hoff | 2021-09-06 | 1 | -2/+25 |
| * | Allow room creator to send MSC2716 related events in existing room versions (... | Eric Eastwood | 2021-09-04 | 1 | -3/+25 |
* | | Merge branch 'release-v1.41' into matrix-org-hotfixes | Richard van der Hoff | 2021-08-31 | 1 | -3/+20 |
|\| |
|
| * | Merge pull request from GHSA-3x4c-pq33-4w3q | reivilibre | 2021-08-31 | 1 | -3/+20 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2021-07-20 | 1 | -15/+11 |
|\| |
|
| * | Port the ThirdPartyEventRules module interface to the new generic interface (... | Brendan Abolivier | 2021-07-20 | 1 | -4/+4 |
| * | Use inline type hints in `handlers/` and `rest/`. (#10382) | Jonathan de Jong | 2021-07-16 | 1 | -11/+7 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-07-16 | 1 | -4/+14 |
|\| |
|
| * | Add base starting insertion event when no chunk ID is provided (MSC2716) (#10... | Eric Eastwood | 2021-07-08 | 1 | -0/+8 |
| * | Rebuild event auth when rebuilding an event after a call to a `ThirdPartyEven... | Brendan Abolivier | 2021-07-08 | 1 | -4/+6 |
* | | Merge branch 'release-v1.38' into matrix-org-hotfixes | Brendan Abolivier | 2021-07-06 | 1 | -3/+6 |
|\| |
|
| * | Move methods involving event authentication to EventAuthHandler. (#10268) | Patrick Cloke | 2021-07-01 | 1 | -3/+6 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-07-01 | 1 | -0/+7 |
|\| |
|
| * | Correct type hints for synapse.event_auth. (#10253) | Patrick Cloke | 2021-06-30 | 1 | -0/+7 |
* | | Merge branch 'release-v1.37' of github.com:matrix-org/synapse into matrix-org... | Brendan Abolivier | 2021-06-23 | 1 | -5/+99 |
|\| |
|
| * | Add endpoints for backfilling history (MSC2716) (#9247) | Eric Eastwood | 2021-06-22 | 1 | -5/+99 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-06-16 | 1 | -10/+20 |
|\| |
|
| * | Implement knock feature (#6739) | Sorunome | 2021-06-09 | 1 | -10/+20 |
* | | Merge branch 'release-v1.34.0' into matrix-org-hotfixes | Brendan Abolivier | 2021-05-12 | 1 | -5/+40 |
|\| |
|
| * | Run cache_joined_hosts_for_event in background (#9951) | Erik Johnston | 2021-05-12 | 1 | -5/+40 |
| * | Always cache 'event_to_prev_state_group' (#9950) | Erik Johnston | 2021-05-07 | 1 | -6/+7 |
* | | Always cache 'event_to_prev_state_group' | Erik Johnston | 2021-05-07 | 1 | -6/+7 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-05-06 | 1 | -12/+48 |
|\| |
|
| * | Don't set the external cache if its been done recently (#9905) | Erik Johnston | 2021-05-05 | 1 | -4/+30 |
| * | Use get_current_users_in_room from store and not StateHandler (#9910) | Erik Johnston | 2021-05-05 | 1 | -1/+1 |
| * | Add missing type hints to handlers and fix a Spam Checker type hint. (#9896) | Patrick Cloke | 2021-04-29 | 1 | -7/+17 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2021-04-19 | 1 | -1/+0 |
|\| |
|
| * | Remove redundant "coding: utf-8" lines (#9786) | Jonathan de Jong | 2021-04-14 | 1 | -1/+0 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Andrew Morgan | 2021-04-13 | 1 | -3/+8 |
|\| |
|
| * | Bugbear: Add Mutable Parameter fixes (#9682) | Jonathan de Jong | 2021-04-08 | 1 | -3/+8 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Patrick Cloke | 2021-04-08 | 1 | -1/+1 |
|\| |
|
| * | Replace `room_invite_state_types` with `room_prejoin_state` (#9700) | Richard van der Hoff | 2021-03-30 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-02-22 | 1 | -1/+7 |
|\| |
|
| * | Add configs to make profile data more private (#9203) | AndrewFerr | 2021-02-19 | 1 | -1/+7 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2021-02-17 | 1 | -11/+23 |
|\| |
|
| * | Update black, and run auto formatting over the codebase (#9381) | Eric Eastwood | 2021-02-16 | 1 | -11/+23 |
* | | Merge remote-tracking branch 'origin/release-v1.27.0' into matrix-org-hotfixes | Erik Johnston | 2021-02-02 | 1 | -1/+1 |
|\| |
|
| * | Add an admin API to get the current room state (#9168) | Travis Ralston | 2021-02-02 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2021-01-26 | 1 | -0/+42 |
|\| |
|
| * | Precompute joined hosts and store in Redis (#9198) | Erik Johnston | 2021-01-26 | 1 | -0/+42 |
* | | Merge remote-tracking branch 'origin/release-v1.25.0' into matrix-org-hotfixes | Richard van der Hoff | 2021-01-05 | 1 | -1/+1 |
|\| |
|
| * | Try and drop stale extremities. (#8929) | Erik Johnston | 2020-12-18 | 1 | -1/+1 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Patrick Cloke | 2020-12-15 | 1 | -1/+1 |
|\| |
|
| * | Allow spam-checker modules to be provide async methods. (#8890) | David Teller | 2020-12-11 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-11-27 | 1 | -11/+10 |
|\| |
|
| * | Add admin API for logging in as a user (#8617) | Erik Johnston | 2020-11-17 | 1 | -11/+10 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-11-13 | 1 | -0/+3 |
|\| |
|
| * | Block clients from sending server ACLs that lock the local server out. (#8708) | Erik Johnston | 2020-11-03 | 1 | -0/+3 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-10-30 | 1 | -31/+9 |
|\| |
|
| * | Merge pull request #8678 from matrix-org/rav/fix_frozen_events | Richard van der Hoff | 2020-10-28 | 1 | -3/+2 |
| |\ |
|
| | * | Remove frozendict_json_encoder and support frozendicts everywhere | Richard van der Hoff | 2020-10-28 | 1 | -3/+2 |
| * | | Abstract code for stripping room state into a separate method (#8671) | Andrew Morgan | 2020-10-27 | 1 | -28/+7 |
* | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-10-27 | 1 | -1/+1 |
|\| | |
|
| * | | Fix typos and spelling errors. (#8639) | Patrick Cloke | 2020-10-23 | 1 | -1/+1 |
| |/ |
|
* | | Merge remote-tracking branch 'origin/release-v1.21.3' into matrix-org-hotfixes | Erik Johnston | 2020-10-22 | 1 | -1/+6 |
|\| |
|
| * | Fix modifying events in `ThirdPartyRules` modules (#8564) | Richard van der Hoff | 2020-10-16 | 1 | -1/+6 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-10-16 | 1 | -15/+94 |
|\| |
|
| * | Merge pull request #8535 from matrix-org/rav/third_party_events_updates | Richard van der Hoff | 2020-10-15 | 1 | -8/+71 |
| |\ |
|
| | * | Allow ThirdPartyRules modules to replace event content | Richard van der Hoff | 2020-10-13 | 1 | -2/+62 |
| | * | Move third_party_rules check to event creation time | Richard van der Hoff | 2020-10-13 | 1 | -8/+11 |
| * | | Simplify `_locally_reject_invite` | Richard van der Hoff | 2020-10-13 | 1 | -2/+20 |
| * | | Remove redundant `token_id` parameter to create_event | Richard van der Hoff | 2020-10-13 | 1 | -5/+3 |
| |/ |
|
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-10-13 | 1 | -85/+116 |
|\| |
|
| * | Move additional tasks to the background worker, part 4 (#8513) | Patrick Cloke | 2020-10-13 | 1 | -9/+9 |
| * | Fix message duplication if something goes wrong after persisting the event (#... | Erik Johnston | 2020-10-13 | 1 | -8/+40 |
| * | Allow modules to create and send events into rooms (#8479) | Andrew Morgan | 2020-10-09 | 1 | -6/+5 |
| * | Remove the deprecated Handlers object (#8494) | Patrick Cloke | 2020-10-09 | 1 | -2/+2 |
| * | update wording | Richard van der Hoff | 2020-10-07 | 1 | -2/+3 |
| * | kill off `send_nonmember_event` | Richard van der Hoff | 2020-10-05 | 1 | -49/+25 |
| * | pull up event.sender assertion | Richard van der Hoff | 2020-10-05 | 1 | -4/+4 |
| * | Move shadow-ban check down into `handle_new_client_event`. | Richard van der Hoff | 2020-10-05 | 1 | -8/+24 |
| * | De-duplicate duplicate handling | Richard van der Hoff | 2020-10-05 | 1 | -18/+23 |
| * | Remove stream ordering from Metadata dict (#8452) | Richard van der Hoff | 2020-10-05 | 1 | -1/+3 |
* | | Remove redundant `EventCreationHandler._is_worker_app` attribute | Richard van der Hoff | 2020-10-01 | 1 | -3/+1 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-10-01 | 1 | -61/+66 |
|\| |
|
| * | Add EventStreamPosition type (#8388) | Erik Johnston | 2020-09-24 | 1 | -3/+3 |
| * | Factor out `_send_dummy_event_for_room` (#8370) | Richard van der Hoff | 2020-09-23 | 1 | -48/+54 |
| * | Add experimental support for sharding event persister. Again. (#8294) | Erik Johnston | 2020-09-14 | 1 | -6/+8 |
| * | Make `StreamToken.room_key` be a `RoomStreamToken` instance. (#8281) | Erik Johnston | 2020-09-11 | 1 | -0/+1 |
| * | Clean up `Notifier.on_new_room_event` code path (#8288) | Erik Johnston | 2020-09-10 | 1 | -4/+0 |
| * | Fixup pusher pool notifications (#8287) | Erik Johnston | 2020-09-09 | 1 | -1/+1 |
| * | Revert "Fixup pusher pool notifications" | Erik Johnston | 2020-09-09 | 1 | -1/+1 |
| * | Fixup pusher pool notifications | Erik Johnston | 2020-09-09 | 1 | -1/+1 |
* | | Merge branch 'release-v1.20.0' into matrix-org-hotfixes | Richard van der Hoff | 2020-09-07 | 1 | -2/+2 |
|\| |
|
| * | Stop sub-classing object (#8249) | Patrick Cloke | 2020-09-04 | 1 | -2/+2 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Brendan Abolivier | 2020-09-04 | 1 | -8/+6 |
|\| |
|
| * | Revert "Add experimental support for sharding event persister. (#8170)" (#8242) | Brendan Abolivier | 2020-09-04 | 1 | -8/+6 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Brendan Abolivier | 2020-09-03 | 1 | -16/+11 |
|\| |
|
| * | Add experimental support for sharding event persister. (#8170) | Erik Johnston | 2020-09-02 | 1 | -6/+8 |
| * | Convert additional databases to async/await part 2 (#8200) | Patrick Cloke | 2020-09-01 | 1 | -10/+3 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Patrick Cloke | 2020-08-27 | 1 | -18/+62 |
|\| |
|
| * | Remove unused parameter from, and add safeguard in, get_room_data (#8174) | Andrew Morgan | 2020-08-26 | 1 | -8/+12 |
| * | Do not allow send_nonmember_event to be called with shadow-banned users. (#8158) | Patrick Cloke | 2020-08-25 | 1 | -5/+34 |
| * | Stop shadow-banned users from sending non-member events. (#8142) | Patrick Cloke | 2020-08-24 | 1 | -0/+10 |
| * | Be stricter about JSON that is accepted by Synapse (#8106) | Patrick Cloke | 2020-08-19 | 1 | -2/+3 |
| * | Convert events worker database to async/await. (#8071) | Patrick Cloke | 2020-08-18 | 1 | -3/+3 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-08-18 | 1 | -10/+15 |
|\| |
|
| * | Fix the return type of send_nonmember_events. (#8112) | Patrick Cloke | 2020-08-18 | 1 | -1/+1 |
| * | Return the previous stream token if a non-member event is a duplicate. (#8093) | Patrick Cloke | 2020-08-18 | 1 | -10/+15 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-08-18 | 1 | -3/+1 |
|\| |
|
| * | Run `remove_push_actions_from_staging` in foreground (#8081) | Richard van der Hoff | 2020-08-13 | 1 | -3/+1 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Brendan Abolivier | 2020-08-13 | 1 | -11/+24 |
|\| |
|
| * | Add type hints to handlers.message and events.builder (#8067) | Erik Johnston | 2020-08-12 | 1 | -9/+13 |
| * | Add an assertion on prev_events in create_new_client_event (#8041) | Richard van der Hoff | 2020-08-10 | 1 | -0/+9 |
| * | Convert synapse.api to async/await (#8031) | Patrick Cloke | 2020-08-06 | 1 | -1/+1 |
| * | Rename database classes to make some sense (#8033) | Erik Johnston | 2020-08-05 | 1 | -1/+1 |
* | | Merge branch 'release-v1.18.0' into matrix-org-hotfixes | Richard van der Hoff | 2020-07-28 | 1 | -12/+7 |
|\| |
|
| * | Remove hacky error handling for inlineDeferreds. (#7950) | Patrick Cloke | 2020-07-27 | 1 | -12/+7 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-07-24 | 1 | -132/+152 |
|\| |
|
| * | Convert the message handler to async/await. (#7884) | Patrick Cloke | 2020-07-22 | 1 | -136/+152 |
| * | Convert _base, profile, and _receipts handlers to async/await (#7860) | Patrick Cloke | 2020-07-17 | 1 | -2/+6 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-07-09 | 1 | -7/+16 |
|\| |
|
| * | Generate real events when we reject invites (#7804) | Richard van der Hoff | 2020-07-09 | 1 | -7/+16 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Erik Johnston | 2020-06-25 | 1 | -1/+3 |
|\| |
|
| * | Convert directory handler to async/await (#7727) | Patrick Cloke | 2020-06-22 | 1 | -1/+3 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-06-17 | 1 | -6/+4 |
|\| |
|
| * | Replace all remaining six usage with native Python 3 equivalents (#7704) | Dagfinn Ilmari Mannsåker | 2020-06-16 | 1 | -3/+1 |
| * | Replace iteritems/itervalues/iterkeys with native versions. (#7692) | Patrick Cloke | 2020-06-15 | 1 | -4/+4 |
* | | Merge tag 'v1.15.0rc1' of github.com:matrix-org/synapse into matrix-org-hotfixes | Brendan Abolivier | 2020-06-10 | 1 | -1/+0 |
|\| |
|
| * | Performance improvements and refactor of Ratelimiter (#7595) | Andrew Morgan | 2020-06-05 | 1 | -1/+0 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-05-26 | 1 | -15/+33 |
|\| |
|
| * | Optimise some references to hs.config (#7546) | Richard van der Hoff | 2020-05-22 | 1 | -3/+5 |
| * | Add option to move event persistence off master (#7517) | Erik Johnston | 2020-05-22 | 1 | -5/+7 |
| * | Add ability to wait for replication streams (#7542) | Erik Johnston | 2020-05-22 | 1 | -11/+25 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-05-21 | 1 | -4/+6 |
|\| |
|
| * | Omit displayname or avatar_url if they aren't set instead of returning null (... | Aaron Raimist | 2020-05-19 | 1 | -2/+6 |
| * | Allow censoring of events to happen on workers. (#7492) | Erik Johnston | 2020-05-13 | 1 | -2/+0 |
* | | Merge branch 'rav/matrix_hacks' into matrix-org-hotfixes | Richard van der Hoff | 2020-05-20 | 1 | -3/+5 |
|\ \ |
|
| * | | inline some config references | Richard van der Hoff | 2020-05-20 | 1 | -3/+5 |
| |/ |
|
* | | Merge branch 'release-v1.13.0' into matrix-org-hotfixes | Richard van der Hoff | 2020-05-07 | 1 | -1/+3 |
|\| |
|
| * | Add a configuration setting for the dummy event threshold (#7422) | Brendan Abolivier | 2020-05-07 | 1 | -1/+3 |
* | | Merge branch 'release-v1.13.0' into matrix-org-hotfixes | Richard van der Hoff | 2020-05-06 | 1 | -44/+39 |
|\| |
|
| * | async/await is_server_admin (#7363) | Andrew Morgan | 2020-05-01 | 1 | -44/+39 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-04-24 | 1 | -19/+38 |
|\| |
|
| * | Use the proper error code when a canonical alias that does not exist is used.... | Patrick Cloke | 2020-03-23 | 1 | -19/+38 |
| * | Don't filter out dummy events when we're checking the visibility of state | Brendan Abolivier | 2020-03-11 | 1 | -1/+1 |
* | | Don't filter out events when we're checking the visibility of state | Brendan Abolivier | 2020-03-11 | 1 | -1/+1 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Brendan Abolivier | 2020-03-09 | 1 | -3/+44 |
|\| |
|
| * | Validate the alt_aliases property of canonical alias events (#6971) | Patrick Cloke | 2020-03-03 | 1 | -3/+44 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-02-27 | 1 | -3/+2 |
|\| |
|
| * | Port PresenceHandler to async/await (#6991) | Erik Johnston | 2020-02-26 | 1 | -3/+2 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-02-19 | 1 | -4/+8 |
|\| |
|
| * | Add `allow_departed_users` param to `check_in_room_or_world_readable` | Richard van der Hoff | 2020-02-19 | 1 | -4/+8 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-02-18 | 1 | -3/+2 |
|\| |
|
| * | make FederationHandler.send_invite async | Richard van der Hoff | 2020-02-03 | 1 | -3/+2 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-01-31 | 1 | -5/+11 |
|\| |
|
| * | s/get_room_version/get_room_version_id/ | Richard van der Hoff | 2020-01-31 | 1 | -3/+5 |
| * | Pass room version object into event_auth.check and check_redaction (#6788) | Richard van der Hoff | 2020-01-28 | 1 | -2/+6 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2020-01-07 | 1 | -28/+15 |
|\| |
|
| * | Remove unused hashes and depths from create_event params | Richard van der Hoff | 2020-01-06 | 1 | -16/+5 |
| * | Remove unused hashes and depths from create_new_client_event params | Richard van der Hoff | 2020-01-06 | 1 | -12/+14 |
| * | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ... | Richard van der Hoff | 2020-01-06 | 1 | -9/+3 |
| * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_room | Richard van der Hoff | 2020-01-06 | 1 | -2/+4 |
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes | Richard van der Hoff | 2020-01-06 | 1 | -7/+8 |
|\| |
|
| * | Change EventContext to use the Storage class (#6564) | Erik Johnston | 2019-12-20 | 1 | -5/+5 |
| * | Prevent redacted events from appearing in message search (#6377) | Andrew Morgan | 2019-12-11 | 1 | -2/+3 |
* | | Merge branch 'release-v1.7.0' of github.com:matrix-org/synapse into matrix-or... | Neil Johnson | 2019-12-10 | 1 | -5/+128 |
|\| |
|
| * | Pull out room_invite_state_types config option once. | Erik Johnston | 2019-12-09 | 1 | -1/+3 |
| * | Add ephemeral messages support (MSC2228) (#6409) | Brendan Abolivier | 2019-12-03 | 1 | -1/+122 |
| * | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-28 | 1 | -1/+1 |
| * | Implement per-room message retention policies | Brendan Abolivier | 2019-11-04 | 1 | -2/+2 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-11-19 | 1 | -12/+17 |
|\| |
|
| * | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 1 | -6/+8 |
| * | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 1 | -4/+6 |
| |\ |
|
| | * | Port to use state storage | Erik Johnston | 2019-10-30 | 1 | -4/+6 |
| * | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 1 | -1/+1 |
| |/ |
|
| * | Use new EventPersistenceStore | Erik Johnston | 2019-10-23 | 1 | -1/+2 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2019-09-26 | 1 | -27/+72 |
|\| |
|
| * | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 1 | -27/+72 |
* | | Merge branch 'develop' into matrix-org-hotfixes | Richard van der Hoff | 2019-09-18 | 1 | -1/+21 |
|\| |
|
| * | Fix comments | Erik Johnston | 2019-09-11 | 1 | -1/+1 |
| * | Fix how we check for self redaction | Erik Johnston | 2019-09-11 | 1 | -4/+18 |
| * | Allow use of different ratelimits for admin redactions. | Erik Johnston | 2019-09-11 | 1 | -1/+7 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-08-29 | 1 | -1/+4 |
|\| |
|
| * | Apply suggestions from code review | Will Hunt | 2019-08-23 | 1 | -2/+2 |
| * | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 |
| * | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-08-01 | 1 | -1/+3 |
|\| |
|
| * | Deny redaction of events in a different room. | Erik Johnston | 2019-07-31 | 1 | -1/+3 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-07-30 | 1 | -18/+22 |
|\| |
|
| * | Stop trying to fetch events with event_id=None. (#5753) | Richard van der Hoff | 2019-07-24 | 1 | -1/+7 |
| * | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 1 | -17/+15 |
* | | Merge branch 'release-v1.2.0' into matrix-org-hotfixes | Richard van der Hoff | 2019-07-18 | 1 | -9/+24 |
|\| |
|
| * | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -9/+24 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-07-17 | 1 | -1/+1 |
|\| |
|
| * | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 1 | -1/+1 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-06-21 | 1 | -144/+159 |
|\| |
|
| * | Run Black. (#5482) | Amber Brown | 2019-06-20 | 1 | -158/+100 |
| * | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 1 | -2/+5 |
| * | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 1 | -1/+71 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-06-17 | 1 | -2/+12 |
|\| |
|
| * | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 1 | -2/+12 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-05-24 | 1 | -0/+3 |
|\| |
|
| * | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events | Erik Johnston | 2019-05-24 | 1 | -0/+3 |
| |\ |
|
| | * | Don't bundle aggs for /state and /members etc APIs | Erik Johnston | 2019-05-24 | 1 | -0/+3 |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes | Erik Johnston | 2019-05-23 | 1 | -1/+15 |
|\| | |
|
| * | | Fix words | Erik Johnston | 2019-05-21 | 1 | -3/+3 |