summary refs log tree commit diff
path: root/synapse/handlers/room_member.py (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2022-03-291-19/+31
|\
| * Remove unused `auth_event_ids` argument plumbing (#12304)Eric Eastwood2022-03-291-19/+0
| * Refactor `create_new_client_event` to use a new parameter, `state_event_ids`,...Eric Eastwood2022-03-251-0/+31
| |
| \
*-. \ Merge branch 'release-v1.54', remote-tracking branch 'origin' into matrix-org...Olivier Wilkinson (reivilibre)2022-03-081-1/+1
|\ \ \ | | |/ | |/|
| * | Avoid generating state groups for local out-of-band leaves (#12154)Richard van der Hoff2022-03-031-1/+1
| |/
* | Merge commit 'd8001' (pre v1.54.0rc1) into matrix-org-hotfixesOlivier Wilkinson (reivilibre)2022-03-021-1/+1
|\|
| * Remove `HomeServer.get_datastore()` (#12031)Richard van der Hoff2022-02-231-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2022-02-221-2/+4
|\|
| * Limit concurrent AS joins (#11996)Brendan Abolivier2022-02-161-19/+27
* | Merge branch 'release-v1.53' into matrix-org-hotfixesSean Quah2022-02-151-3/+28
|\|
| * Fix historical messages backfilling in random order on remote homeservers (MS...Eric Eastwood2022-02-071-2/+20
| * Add a ratelimiter for 3pid invite (#11892)Brendan Abolivier2022-02-031-1/+8
* | Merge branch 'release-v1.52' into matrix-org-hotfixesDavid Robertson2022-02-011-0/+6
|\|
| * Configurable limits on avatars (#11846)Brendan Abolivier2022-01-281-0/+6
* | Merge branch 'release-v1.50' into matrix-org-hotfixesOlivier Wilkinson (reivilibre)2022-01-051-3/+6
|\|
| * Add type hints to `synapse/storage/databases/main/room.py` (#11575)Sean Quah2021-12-151-2/+4
| * Allow events to be created with no `prev_events` (MSC2716) (#11243)Eric Eastwood2021-12-101-1/+2
* | Merge branch 'develop' into matrix-org-hotfixesBrendan Abolivier2021-11-251-0/+15
|\|
| * Prevent historical state from being pushed to an application service via `/tr...Eric Eastwood2021-11-181-0/+15
* | Merge branch 'release-v1.47' into matrix-org-hotfixesOlivier Wilkinson (reivilibre)2021-11-091-1/+3
|\|
| * Add remaining type hints to `synapse.events`. (#11098)Patrick Cloke2021-11-021-1/+3
* | Merge branch 'release-v1.45' into matrix-org-hotfixesBrendan Abolivier2021-10-121-16/+58
|\|
| * Remove the deprecated BaseHandler. (#11005)Patrick Cloke2021-10-081-6/+2
| * Add a spamchecker method to allow or deny 3pid invites (#10894)Brendan Abolivier2021-10-061-0/+12
| * Require direct references to configuration variables. (#10985)Patrick Cloke2021-10-061-2/+5
| * Add a spamchecker callback to allow or deny room joins (#10910)Brendan Abolivier2021-10-061-0/+31
| * Use direct references for configuration variables (part 7). (#10959)Patrick Cloke2021-10-041-1/+1
| * Strip "join_authorised_via_users_server" from join events which do not need i...Patrick Cloke2021-09-301-1/+9
| * Use direct references for configuration variables (part 6). (#10916)Patrick Cloke2021-09-291-7/+7
* | Merge branch 'release-v1.44' into matrix-org-hotfixesBrendan Abolivier2021-10-041-1/+9
|\ \
| * | Strip "join_authorised_via_users_server" from join events which do not need i...Patrick Cloke2021-10-011-1/+9
| |/
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-09-281-1/+1
|\|
| * Use direct references for configuration variables (part 5). (#10897)Patrick Cloke2021-09-241-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesDavid Robertson2021-09-221-5/+5
|\|
| * Allow sending a membership event to unban a user (#10807)Aaron Raimist2021-09-211-1/+1
| * Require type hints in the handlers module. (#10831)Patrick Cloke2021-09-201-4/+4
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-09-101-6/+59
|\|
| * Move `maybe_kick_guest_users` out of `BaseHandler` (#10744)Richard van der Hoff2021-09-061-6/+59
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesOlivier Wilkinson (reivilibre)2021-08-311-1/+16
|\|
| * Enforce the max length for per-room display names / avatar URLs. (#10654)Azrenbeth2021-08-231-1/+16
* | Merge branch 'release-v1.41' into matrix-org-hotfixesAndrew Morgan2021-08-171-1/+12
|\|
| * Send unstable-prefixed room_type in store-invite IS API requests (#10435)Michael Telatynski2021-08-041-1/+12
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesOlivier Wilkinson (reivilibre)2021-08-031-8/+167
|\|
| * Update the MSC3083 support to verify if joins are from an authorized server. ...Patrick Cloke2021-07-261-8/+167
* | Merge branch 'release-v1.37' of github.com:matrix-org/synapse into matrix-org...Brendan Abolivier2021-06-231-0/+90
|\|
| * Add endpoints for backfilling history (MSC2716) (#9247)Eric Eastwood2021-06-221-0/+90
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-06-161-31/+163
|\|
| * Remove the experimental flag for knocking and use stable prefixes / endpoints...Patrick Cloke2021-06-151-4/+1
| * Implement knock feature (#6739)Sorunome2021-06-091-31/+166
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-251-15/+5
|\|
| * Refactor checking restricted join rules (#10007)Patrick Cloke2021-05-181-15/+5
* | Merge branch 'release-v1.34.0' into matrix-org-hotfixesBrendan Abolivier2021-05-121-0/+25
|\|
| * Correctly ratelimit invites when creating a room (#9968)Brendan Abolivier2021-05-121-0/+25
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-05-061-1/+1
|\|
| * Add missing type hints to handlers and fix a Spam Checker type hint. (#9896)Patrick Cloke2021-04-291-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-271-59/+3
|\|
| * Check for space membership during a remote join of a restricted room (#9814)Patrick Cloke2021-04-231-59/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-191-1/+0
|\|
| * Revert "Check for space membership during a remote join of a restricted room....Patrick Cloke2021-04-141-3/+59
| * Check for space membership during a remote join of a restricted room. (#9763)Patrick Cloke2021-04-141-59/+3
| * Remove redundant "coding: utf-8" lines (#9786)Jonathan de Jong2021-04-141-1/+0
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2021-04-131-1/+74
|\|
| * MSC3083: Check for space membership during a local join of restricted rooms. ...Patrick Cloke2021-04-081-1/+74
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesPatrick Cloke2021-04-081-8/+15
|\|
| * Make RateLimiter class check for ratelimit overrides (#9711)Erik Johnston2021-03-301-8/+15
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-03-241-0/+4
|\|
| * Add type hints to the room member handler. (#9631)Patrick Cloke2021-03-171-0/+4
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2021-02-171-8/+19
|\|
| * Update black, and run auto formatting over the codebase (#9381)Eric Eastwood2021-02-161-8/+19
* | Merge branch 'erikj/media_spam_checker' into matrix-org-hotfixesErik Johnston2021-02-051-3/+9
|\|
| * Honour ratelimit flag for application services for invite ratelimiting (#9302)Erik Johnston2021-02-031-3/+9
* | Merge remote-tracking branch 'origin/release-v1.27.0' into matrix-org-hotfixesErik Johnston2021-02-021-2/+23
|\|
| * Ratelimit invites by room and target user (#9258)Erik Johnston2021-01-291-2/+23
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2021-01-191-2/+5
|\|
| * Allow moving account data and receipts streams off master (#9104)Erik Johnston2021-01-181-2/+5
* | Merge branch 'develop' into matrix-org-hotfixesPatrick Cloke2020-12-151-11/+14
|\|
| * Allow spam-checker modules to be provide async methods. (#8890)David Teller2020-12-111-1/+1
| * Don't ratelimit autojoining of rooms (#8921)Erik Johnston2020-12-111-10/+13
* | Merge branch 'release-v1.24.0' of github.com:matrix-org/synapse into matrix-o...Patrick Cloke2020-12-021-1/+9
|\|
| * Allow per-room profile to be used for server notice user (#8799)Mathieu Velten2020-11-301-1/+9
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-11-271-23/+34
|\|
| * Speed up remote invite rejection database call (#8815)Andrew Morgan2020-11-251-5/+11
| * Add admin API for logging in as a user (#8617)Erik Johnston2020-11-171-1/+4
| * Generalise _locally_reject_invite (#8751)Andrew Morgan2020-11-161-17/+19
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-301-2/+6
|\|
| * Optimise createRoom with multiple invites (#8559)Richard van der Hoff2020-10-291-2/+6
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-10-161-44/+15
|\|
| * Simplify `_locally_reject_invite`Richard van der Hoff2020-10-131-43/+15
| * Remove redundant `token_id` parameter to create_eventRichard van der Hoff2020-10-131-1/+0
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesErik Johnston2020-10-131-30/+31
|\|
| * Fix message duplication if something goes wrong after persisting the event (#...Erik Johnston2020-10-131-1/+12
| * Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-091-3/+3
| * De-duplicate duplicate handlingRichard van der Hoff2020-10-051-20/+9
| * Remove stream ordering from Metadata dict (#8452)Richard van der Hoff2020-10-051-6/+7
| * Do not assume that account data is of the correct form. (#8454)Patrick Cloke2020-10-051-3/+3
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-10-011-1/+1
|\|
| * Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-011-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2020-10-011-48/+5
|\|
| * Switch metaclass initialization to python 3-compatible syntax (#8326)Jonathan de Jong2020-09-161-3/+1
| * Add experimental support for sharding event persister. Again. (#8294)Erik Johnston2020-09-141-7/+0
| * Remove some unused distributor signals (#8216)Patrick Cloke2020-09-091-38/+4
* | Merge branch 'release-v1.20.0' into matrix-org-hotfixesRichard van der Hoff2020-09-071-1/+1
|\|
| * Stop sub-classing object (#8249)Patrick Cloke2020-09-041-1/+1
* | Merge branch 'develop' into matrix-org-hotfixesBrendan Abolivier2020-09-041-0/+7
|\|
| * Revert "Add experimental support for sharding event persister. (#8170)" (#8242)Brendan Abolivier2020-09-041-0/+7
* | Merge branch 'develop' into matrix-org-hotfixesBrendan Abolivier2020-09-031-17/+2
|\|
| * Add experimental support for sharding event persister. (#8170)Erik Johnston2020-09-021-7/+0
| * Convert additional databases to async/await part 2 (#8200)Patrick Cloke2020-09-011-10/+2
* | Merge branch 'develop' into matrix-org-hotfixesPatrick Cloke2020-08-271-35/+103
|\|
| * Do not propagate profile changes of shadow-banned users into rooms. (#8157)Patrick Cloke2020-08-261-1/+1
| * Merge tag 'v1.19.1rc1' into developBrendan Abolivier2020-08-251-21/+25
| |\
| | * Fix join ratelimiter breaking profile updates and idempotency (#8153)Brendan Abolivier2020-08-241-21/+25
| | * Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-241-6/+8
| * | Add type hints for state. (#8140)Patrick Cloke2020-08-241-8/+12
| * | Do not apply ratelimiting on joins to appservices (#8139)Will Hunt2020-08-211-6/+8
| * | Stop shadow-banned users from sending invites. (#8095)Patrick Cloke2020-08-201-2/+60
| * | Convert events worker database to async/await. (#8071)Patrick Cloke2020-08-181-1/+1
| |/
* | Merge branch 'develop' into matrix-org-hotfixesBrendan Abolivier2020-08-131-6/+43
|\|
| * Add type hints to handlers.message and events.builder (#8067)Erik Johnston2020-08-121-4/+8
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l...Erik Johnston2020-07-311-10/+27
| |\
| * | Add ratelimiting on joinsErik Johnston2020-07-311-2/+35
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-311-10/+27
|\ \ \ | | |/ | |/|
| * | Fix invite rejection when we have no forward-extremeties (#7980)Richard van der Hoff2020-07-301-8/+21
| * | Option to allow server admins to join complex rooms (#7902)lugino-emeritus2020-07-281-2/+6
| |/
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-241-4/+4
|\|
| * `update_membership` declaration: now always returns an event id. (#7809)Richard van der Hoff2020-07-091-4/+4
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-091-1/+1
|\|
| * Fix `can only concatenate list (not "tuple") to list` exception (#7810)Richard van der Hoff2020-07-091-1/+1
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-07-091-61/+133
|\|
| * Generate real events when we reject invites (#7804)Richard van der Hoff2020-07-091-61/+133
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-06-171-4/+3
|\|
| * Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-161-4/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-05-261-29/+69
|\|
| * Add option to move event persistence off master (#7517)Erik Johnston2020-05-221-8/+31
| * Add ability to wait for replication streams (#7542)Erik Johnston2020-05-221-24/+41
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-05-211-177/+183
|\|
| * Add type hints to room member handlers (#7513)Patrick Cloke2020-05-151-132/+152
| * Update the room member handler to use async/await. (#7507)Patrick Cloke2020-05-151-62/+49
| * Convert federation handler to async/await. (#7459)Patrick Cloke2020-05-111-3/+2
* | fix bad mergeRichard van der Hoff2020-05-061-19/+3
* | Merge branch 'release-v1.13.0' into matrix-org-hotfixesRichard van der Hoff2020-05-061-66/+73
|\|
| * async/await is_server_admin (#7363)Andrew Morgan2020-05-011-68/+59
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2020-04-241-0/+3
|\|
| * Transfer alias mappings when joining an upgraded room (#6946)Andrew Morgan2020-03-301-0/+3
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-02-181-4/+8
|\|
| * make FederationHandler.do_remotely_reject_invite asyncRichard van der Hoff2020-02-031-2/+4
| * make FederationHandler.do_invite_join asyncRichard van der Hoff2020-02-031-2/+4
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesBrendan Abolivier2020-01-221-1/+1
|\|
| * Add `local_current_membership` table (#6655)Erik Johnston2020-01-151-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2020-01-071-6/+5
|\|
| * Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-061-6/+5
| |\
| | * Remove unused hashes and depths from _update_membership paramsRichard van der Hoff2020-01-061-13/+4
| | * Remove unused hashes and depths from create_event paramsRichard van der Hoff2020-01-061-1/+7
| | * rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-1/+3
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2020-01-061-2/+4
|\| |
| * | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-061-0/+2
| |/
| * Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-201-2/+2
* | Merge branch 'release-v1.7.0' of github.com:matrix-org/synapse into matrix-or...Neil Johnson2019-12-101-4/+9
|\|
| * Propagate reason in remotely rejected invitesErik Johnston2019-11-281-4/+9
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-11-191-43/+82
|\|
| * Re-add docstring, with caveats detailedAndrew Morgan2019-11-041-1/+1
| * Transfer upgraded rooms on groupsAndrew Morgan2019-11-041-0/+9
| * Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-011-27/+54
| * Update black to 19.10b0 (#6304)Amber Brown2019-11-011-16/+19
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-10-111-18/+44
|\|
| * Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2019-10-101-18/+44
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-10-021-366/+8
|\|
| * Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2019-10-021-2/+2
| * Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2019-09-271-364/+6
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2019-09-241-10/+29
|\|
| * Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-231-1/+6
| * Return timeout error to user for identity server calls (#6073)Andrew Morgan2019-09-231-9/+23
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-09-181-44/+248
|\|
| * v2 3PID Invites (part of MSC2140) (#5979)Andrew Morgan2019-09-171-23/+81
| * Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-111-12/+166
| * Add note about extra arg to send_membership_event, remove arg in remote_rejec...Andrew Morgan2019-09-111-10/+2
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-09-041-8/+3
|\|
| * code cleanupsAndrew Morgan2019-09-031-7/+2
| * Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-1/+1
* | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2019-08-301-119/+9
|\|
| * Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-301-119/+9
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-08-291-9/+119
|\|
| * Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-281-9/+119
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-07-301-25/+101
|\|
| * Room Complexity Client Implementation (#5783)Amber Brown2019-07-301-4/+80
| * Replace returnValue with return (#5736)Amber Brown2019-07-231-21/+21
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-07-171-40/+15
|\|
| * Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-081-39/+1
| |\
| | * Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-051-39/+0
| * | LintBrendan Abolivier2019-07-081-1/+2
| * | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
* | | Merge branch 'release-v1.1.0' into matrix-org-hotfixesRichard van der Hoff2019-07-021-0/+1
|\ \ \ | | |/ | |/|
| * | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| * | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-06-211-186/+122
|\|
| * Run Black. (#5482)Amber Brown2019-06-201-189/+115
| * Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-171-0/+10
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-05-201-1/+10
|\|
| * fix mapping of return values for get_or_register_3pid_guest (#5177)bytepoets-blo2019-05-171-1/+1
| * Add option to disable per-room profilesBrendan Abolivier2019-05-161-0/+9
* | Merge tag 'v0.99.4rc1' into matrix-org-hotfixesRichard van der Hoff2019-05-141-2/+3
|\|
| * Rate limit earlyErik Johnston2019-05-021-2/+3
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_...Erik Johnston2019-04-261-0/+5
| |\
* | \ Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2019-05-021-0/+5
|\ \ \ | | |/ | |/|
| * | Add config option to block users from looking up 3PIDs (#5010)Brendan Abolivier2019-04-041-0/+5
* | | Merge branch 'erikj/ratelimit_3pid_invite' of github.com:matrix-org/synapse i...Erik Johnston2019-04-261-0/+10
|\ \ \ | | |/ | |/|
| * | Ratelimit 3pid invitesErik Johnston2019-04-261-0/+10
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-04-041-0/+9
|\|
| * Prevent kicking users who aren't in the room (#4999)Andrew Morgan2019-04-041-0/+9
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-211-0/+6
|\|
| * Use flagsErik Johnston2019-03-201-0/+6
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-141-0/+4
|\|
| * Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-121-0/+4
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-02-201-1/+1
|\|
| * Fix registration on workers (#4682)Erik Johnston2019-02-201-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-01-301-1/+2
|\|
| * Remove event ID usage when checking if new roomErik Johnston2019-01-291-1/+2
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2019-01-291-11/+74
|\|
| * Change return syntax in doc stringAndrew Morgan2019-01-281-1/+1
| * Reuse predecessor methodAndrew Morgan2019-01-281-12/+8
| * FixesAndrew Morgan2019-01-251-39/+39
| * Clean up direct_rooms accessAndrew Morgan2019-01-251-3/+3
| * Use python magicAndrew Morgan2019-01-251-2/+1
| * Destructure account data tuple before useAndrew Morgan2019-01-251-3/+3
| * Remove unnecessary null checkAndrew Morgan2019-01-251-7/+6
| * Move room_tag declaration to be closer to its useAndrew Morgan2019-01-251-4/+5
| * Move tag and direct state copying into separate functionAndrew Morgan2019-01-251-43/+63
| * lintAndrew Morgan2019-01-221-1/+3
| * Prevent duplicate room IDs in m.directAndrew Morgan2019-01-221-10/+9
| * Fix commentsAndrew Morgan2019-01-221-2/+2
| * tags, m.direct copying over correctlyAndrew Morgan2019-01-221-2/+49
| * Fix typosAndrew Morgan2019-01-221-8/+8
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-09-201-0/+5
|\|
| * Use directory server for room joins (#3899)Richard van der Hoff2018-09-181-0/+5
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-08-221-0/+1
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-201-1/+1
| |\
| * | Revert spurious changeErik Johnston2018-08-201-2/+2
| * | Choose state algorithm based on room versionErik Johnston2018-08-091-2/+3
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-08-151-1/+1
|\ \ \ | | |/ | |/|
| * | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-101-1/+1
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-08-061-0/+4
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_...Michael Telatynski2018-07-241-117/+343
| |\
| * | if inviter_display_name == ""||None then default to inviter MXIDMichael Telatynski2018-06-131-0/+4
* | | Fixup limiterhera2018-07-231-2/+2
* | | Lower hacky timeout for member limiterhera2018-07-231-2/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-07-231-3/+6
|\ \ \ | | |/ | |/|
| * | Use new gettersErik Johnston2018-07-231-3/+6
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-07-101-9/+7
|\| |
| * | run isortAmber Brown2018-07-091-8/+6
* | | Fix PEP8Erik Johnston2018-07-031-4/+4