summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into matthew/heroes-for-avatars matthew/heroes-for-avatarsAmber Brown2018-11-0321-358/+1309
|\
| * Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-031-4/+10
| * Include a version query string arg for the consent routeTravis Ralston2018-10-311-1/+4
| * Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-318-133/+515
| |\
| | * Merge pull request #4101 from matrix-org/rav/aliases_for_upgradesRichard van der Hoff2018-10-312-14/+140
| | |\
| | | * Avoid else clause on exception for clarityRichard van der Hoff2018-10-311-2/+1
| | | * Attempt to move room aliases on room upgradesRichard van der Hoff2018-10-312-14/+141
| | * | Log some bits about event creation (#4121)Richard van der Hoff2018-10-312-0/+7
| | * | Fix search 500ing (#4122)Amber Brown2018-10-311-2/+6
| | * | Delete the disused & unspecced identicon functionality (#4106)Amber Brown2018-10-291-3/+0
| | |/
| | * Merge pull request #4100 from matrix-org/rav/room_upgrade_avatarRichard van der Hoff2018-10-291-1/+2
| | |\
| | | * Remember to copy the avatar on room upgradesRichard van der Hoff2018-10-261-1/+2
| | * | Better handling of odd PLs during room upgradesRichard van der Hoff2018-10-271-44/+81
| | |/
| | * optimise state copyingRichard van der Hoff2018-10-261-7/+5
| | * Address review commentsRichard van der Hoff2018-10-261-7/+9
| | * restrict PLs in old roomRichard van der Hoff2018-10-251-1/+43
| | * copy stateRichard van der Hoff2018-10-251-11/+26
| | * preserve PLsRichard van der Hoff2018-10-251-1/+7
| | * preserve room visibilityRichard van der Hoff2018-10-251-3/+5
| | * Basic initial support for room upgradesRichard van der Hoff2018-10-251-0/+121
| | * Allow power_level_content_override=None for _send_events_for_new_roomRichard van der Hoff2018-10-251-5/+6
| | * Make room_member_handler a member of RoomCreationHandlerRichard van der Hoff2018-10-252-8/+7
| | * Factor _generate_room_id out of create_roomRichard van der Hoff2018-10-251-22/+23
| | * Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-255-86/+72
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-258-43/+79
| | |\
| | | * Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-2513-103/+440
| | | |\
| | | * | remove trailing whiter spaceNeil Johnson2018-10-241-1/+1
| | | * | fix tupleRichard van der Hoff2018-10-241-1/+2
| | | * | remove errant exception and styleNeil Johnson2018-10-231-5/+5
| | | * | clean up config error logic and importsNeil Johnson2018-10-171-14/+16
| | | * | no need to join room if creatorNeil Johnson2018-10-131-1/+2
| | | * | improve auto room join logic, comments and testsNeil Johnson2018-10-121-3/+8
| | | * | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-045-42/+74
| | | |\ \
| | | * | | move logic into register, fix room alias localpart bug, testsNeil Johnson2018-10-041-27/+18
| | | * | | emit room aliases eventMatthew Hodgson2018-09-291-3/+8
| | | * | | fix thinkosMatthew Hodgson2018-09-291-6/+6
| | | * | | fix UTsMatthew Hodgson2018-09-281-4/+9
| | | * | | untested stab at autocreating autojoin roomsMatthew Hodgson2018-09-281-0/+18
| | * | | | Add config option to control alias creationErik Johnston2018-10-191-0/+9
| * | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-249-74/+100
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-241-15/+15
| | |\ \ \ \
| | | * | | | CommentErik Johnston2018-10-241-2/+5
| | | * | | | Rename resolve_events_with_factoryErik Johnston2018-10-241-2/+2
| | | * | | | Fix up use of resolve_events_with_factoryErik Johnston2018-10-161-13/+10
| | * | | | | Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontextsRichard van der Hoff2018-10-243-4/+4
| | |\ \ \ \ \
| | | * | | | | Remove redundant run_as_background_process() from pusherpoolRichard van der Hoff2018-10-223-4/+4
| | * | | | | | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creationErik Johnston2018-10-242-32/+50
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Clean up room alias creationErik Johnston2018-10-192-32/+50
| | | |/ / / /
| | * | | | | Merge pull request #3969 from turt2live/travis/fix-federated-group-requestsTravis Ralston2018-10-231-2/+16
| | |\ \ \ \ \
| | | * | | | | Comments helpTravis Ralston2018-10-231-0/+5
| | | * | | | | isortTravis Ralston2018-10-121-1/+1
| | | * | | | | More sane handling of group errors and pep8Travis Ralston2018-10-121-4/+5
| | | * | | | | Merge branch 'develop' into travis/fix-federated-group-requestsTravis Ralston2018-10-127-91/+181
| | | |\ \ \ \ \
| | | * | | | | | Remove debugging statementTravis Ralston2018-09-261-1/+0
| | | * | | | | | Handle HttpResponseException more safely for federated groupsTravis Ralston2018-09-261-2/+11
| | * | | | | | | Give some more things logcontexts (#4077)Richard van der Hoff2018-10-232-7/+11
| | * | | | | | | Correctly account for cpu usage by background threads (#4074)Richard van der Hoff2018-10-231-14/+4
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-182-9/+14
| |\| | | | | |
| | * | | | | | Fix roomlist since tokens on Python 3 (#4046)Will Hunt2018-10-171-2/+9
| | * | | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-161-7/+5
| | | |_|/ / / | | |/| | | |
| * | | | | | pep8Travis Ralston2018-10-151-1/+1
| * | | | | | Ensure the terms params are actually providedTravis Ralston2018-10-151-0/+1
| * | | | | | Python is hardTravis Ralston2018-10-151-5/+6
| * | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-151-0/+289
| |\| | | | |
| | * | | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-151-0/+289
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Linting soothes the savage PEP8 monsterDavid Baker2018-10-121-4/+9
| | | * | | | PR feedback pt. 1David Baker2018-10-121-20/+21
| | | * | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-0913-205/+498
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Apparently this blank line is Very ImportantDavid Baker2018-10-091-0/+1
| | | * | | | be python3 compatibleDavid Baker2018-10-091-2/+3
| | | * | | | try to make flake8 and isort happyHubert Chathi2018-09-061-1/+1
| | | * | | | update to newer Synapse APIsHubert Chathi2018-08-241-1/+1
| | | * | | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-2420-168/+546
| | | |\ \ \ \
| | | * | | | | support DELETE /version with no argsMatthew Hodgson2018-08-121-1/+1
| | | * | | | | implement remaining tests and make them workMatthew Hodgson2018-08-121-7/+28
| | | * | | | | switch get_current_version_info back to being get_version_infoMatthew Hodgson2018-08-121-4/+7
| | | * | | | | fix flakesMatthew Hodgson2018-08-121-2/+2
| | | * | | | | fix typosMatthew Hodgson2018-08-121-1/+2
| | | * | | | | add a tonne of docstring; make upload_room_keys properly assert versionMatthew Hodgson2018-08-121-8/+103
| | | * | | | | more docstring for the e2e_room_keys restMatthew Hodgson2018-08-121-2/+0
| | | * | | | | fix factoring out of _should_replace_room_keyMatthew Hodgson2018-08-121-3/+4
| | | * | | | | rename room_key_version table correctly, and fix opt argsMatthew Hodgson2018-08-121-3/+3
| | | * | | | | blindly incorporate PR review - needs testing & fixingMatthew Hodgson2018-08-121-30/+58
| | | * | | | | make /room_keys/version workMatthew Hodgson2018-08-121-7/+11
| | | * | | | | implement /room_keys/version too (untested)Matthew Hodgson2018-08-121-5/+42
| | | * | | | | make it work and fix pep8Matthew Hodgson2018-08-121-26/+43
| | | * | | | | interim WIP checkin; doesn't build yetMatthew Hodgson2018-08-121-15/+31
| | | * | | | | total WIP skeleton for /room_keys APIMatthew Hodgson2018-08-121-0/+60
| * | | | | | | Update login terms structure for the proposed language supportTravis Ralston2018-10-121-4/+7
| * | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-122-20/+37
| |\| | | | | |
| | * | | | | | Add description to counter metricErik Johnston2018-10-101-1/+5
| | * | | | | | Track number of non-empty sync responses insteadErik Johnston2018-10-101-9/+15
| | * | | | | | Append _total to metric and fix up spellingErik Johnston2018-10-101-2/+2
| | * | | | | | Add metric to count lazy member sync requestsErik Johnston2018-10-091-6/+20
| | * | | | | | Remove unnecessary extra function call layerErik Johnston2018-10-081-15/+3
| | * | | | | | Use errback pattern and catch async failuresErik Johnston2018-10-081-1/+6
| | | |_|/ / / | | |/| | | |
| * | | | | | Use a flag rather than a new route for the public policyTravis Ralston2018-10-031-1/+1
| * | | | | | Supply params for terms auth stageTravis Ralston2018-10-031-0/+9
| * | | | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-031-0/+4
| |/ / / / /
| * | | | | Fix exception handling in fetching remote profilesErik Johnston2018-10-031-6/+2
| * | | | | Merge pull request #3989 from matrix-org/rav/better_stacktracesRichard van der Hoff2018-10-022-22/+23
| |\ \ \ \ \
| | * | | | | Avoid reraise, to improve stacktracesRichard van der Hoff2018-10-012-22/+23
| * | | | | | Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_stateErik Johnston2018-10-021-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix lazy loaded sync with rejected state eventsErik Johnston2018-10-011-2/+2
| * | | | | | Merge pull request #3968 from matrix-org/rav/fix_federation_errorsRichard van der Hoff2018-10-011-12/+46
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errorsRichard van der Hoff2018-09-273-5/+21
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Include event when resolving state for missing prevsRichard van der Hoff2018-09-271-2/+16
| | * | | | | Include state from remote servers in pdu handlingRichard van der Hoff2018-09-271-4/+19
| | * | | | | Fix "unhashable type: 'list'" exception in federation handlingRichard van der Hoff2018-09-271-7/+12
| * | | | | | Merge pull request #3964 from matrix-org/rav/remove_localhost_checksRichard van der Hoff2018-09-281-0/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix complete fail to do the right thingRichard van der Hoff2018-09-281-0/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #3794 from matrix-org/erikj/faster_typingRichard van der Hoff2018-09-271-3/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typingErik Johnston2018-09-1910-70/+198
| | |\ \ \ \ \
| | * | | | | | Improve performance of getting typing updates for replicationErik Johnston2018-09-051-3/+19
| * | | | | | | Merge pull request #3967 from matrix-org/rav/federation_handler_cleanupsRichard van der Hoff2018-09-271-2/+10
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | more commentsRichard van der Hoff2018-09-271-4/+3
| | * | | | | | Clarifications in FederationHandlerRichard van der Hoff2018-09-271-2/+11
| * | | | | | | Merge pull request #3970 from schnuffle/develop-py3Amber Brown2018-09-272-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Replaced all occurences of e.message with str(e)Schnuffle2018-09-272-2/+2
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2Richard van der Hoff2018-09-271-0/+4
| |\ \ \ \ \ \
| | * | | | | | Logging improvementsRichard van der Hoff2018-09-261-0/+4
| | |/ / / / /
| * / / / / / Include eventid in log lines when processing incoming federation transactions...Richard van der Hoff2018-09-271-26/+39
| |/ / / / /
| * | | | | Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pduAmber Brown2018-09-261-23/+46
| |\ \ \ \ \
| | * | | | | Comments and interface cleanup for on_receive_pduRichard van der Hoff2018-09-201-23/+46
| * | | | | | Only lazy load self-members on initial syncMatthew Hodgson2018-09-251-5/+8
| * | | | | | Always LL ourselves if we're in a room to simplify clients (#3916)Matthew Hodgson2018-09-201-0/+4
| |/ / / / /
| * | / / / Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-191-55/+109
| | |/ / / | |/| | |
| * | | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeoutAmber Brown2018-09-191-1/+30
| |\ \ \ \
| | * | | | Bump timeout on get_missing_events requestRichard van der Hoff2018-09-181-1/+30
| * | | | | Use directory server for room joins (#3899)Richard van der Hoff2018-09-181-0/+5
| |/ / / /
| * | | | Merge pull request #3879 from matrix-org/matthew/fix-autojoinRichard van der Hoff2018-09-181-0/+1
| |\ \ \ \
| | * | | | don't ratelimit autojoinsMatthew Hodgson2018-09-151-0/+1
| * | | | | Reinstate missing null checkRichard van der Hoff2018-09-171-1/+1
| * | | | | Return a 404 when deleting unknown room aliasRichard van der Hoff2018-09-171-3/+16
| |/ / / /
* | | | | oopsMatthew Hodgson2018-09-181-0/+1
* | | | | always calculate heroes for rooms without avatarsMatthew Hodgson2018-09-181-16/+23
|/ / / /
* | | | don't filter membership events based on history visibility (#3874)Matthew Hodgson2018-09-141-8/+1
* | | | show heroes if a room has a 'deleted' name/canonical_alias (#3851)Matthew Hodgson2018-09-121-2/+15
* | | | argh pep8Matthew Hodgson2018-09-121-1/+1
* | | | correctly log gappy sync metricsMatthew Hodgson2018-09-121-1/+1
* | | | fix loglineMatthew Hodgson2018-09-121-1/+1
* | | | Speed up lazy loading (#3827)Matthew Hodgson2018-09-121-30/+88
* | | | Don't send empty tags list down syncErik Johnston2018-09-061-0/+5
* | | | Send existing room tags down sync on joinErik Johnston2018-09-061-0/+8
* | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_stateAmber Brown2018-09-071-8/+8
|\ \ \ \
| * | | | User iter* during sync state calculationsErik Johnston2018-09-051-8/+8
| |/ / /
* / / / Port handlers/ to Python 3 (#3803)Amber Brown2018-09-076-19/+22
|/ / /
* | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_funcErik Johnston2018-09-031-1/+1
|\ \ \
| * | | Remove unnecessary resolve_events_with_state_mapErik Johnston2018-08-221-1/+1
| | |/ | |/|
* | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-311-1/+2
* | | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-281-1/+8
|/ /
* | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-222-9/+26
|\ \
| * | Rename WorkerProfileHandler to BaseProfileHandlerErik Johnston2018-08-221-3/+10
| * | Add assert to ensure handler is only run on masterErik Johnston2018-08-221-0/+2
| * | Remove redundant varsErik Johnston2018-08-221-3/+0
| * | Add some fixmesErik Johnston2018-08-171-0/+4
| * | Call UserDirectoryHandler methods directlyErik Johnston2018-08-171-21/+5
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-1715-84/+409
| |\ \
| * | | Split ProfileHandler into master and workerErik Johnston2018-08-171-7/+14
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-096-55/+112
| |\ \ \
| * | | | Allow profile changes to happen on workersErik Johnston2018-08-071-5/+21
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-2016-109/+445
|\ \ \ \ \
| * \ \ \ \ Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updatesRichard van der Hoff2018-08-173-17/+11
| |\ \ \ \ \
| | * | | | | Fix logcontexts for running pushersRichard van der Hoff2018-08-173-17/+11
| * | | | | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-183-8/+25
| | |_|_|/ / | |/| | | |
| * | | | | block event creation and room creation on hitting resource limitsNeil Johnson2018-08-162-1/+9
| |/ / / /
| * | | | lazyload aware /messages (#3589)Matthew Hodgson2018-08-161-1/+34
| * | | | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-161-10/+149
| * | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-151-2/+2
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-154-31/+108
| | |\ \ \ \
| | * | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-141-1/+0
| | * | | | | fix off by 1s on mauNeil Johnson2018-08-141-2/+2
| | * | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-141-10/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-141-13/+14
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...Neil Johnson2018-08-141-2/+11
| | |\ \ \ \ \ \ \
| * | | | | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-151-12/+76
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-151-17/+57
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-1514-27/+78
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Use federation handler function rather than duplicateErik Johnston2018-08-151-7/+7
| | * | | | | | | | | Move clean_room_for_join to masterErik Johnston2018-08-091-2/+14
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-096-55/+112
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | Add EDU/query handling over replicationErik Johnston2018-08-061-11/+13
| | * | | | | | | | | Add replication APIs for persisting federation eventsErik Johnston2018-08-061-9/+35
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-151-14/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-141-2/+11
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | remove blank lineNeil Johnson2018-08-141-1/+0
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Update register.pyNeil Johnson2018-08-141-10/+0
| | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-131-13/+14
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbindErik Johnston2018-08-153-14/+51
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Log when we 3pid/unbind request failsErik Johnston2018-08-091-0/+2
| | * | | | | | Don't fail requests to unbind 3pids for non supporting ID serversErik Johnston2018-08-083-14/+49
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-141-2/+11
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-091-1/+6
| | * | | | block sync if auth checks failNeil Johnson2018-08-091-7/+5
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-095-34/+69
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | sync auth blockingNeil Johnson2018-08-081-5/+11
| * | | | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-131-14/+13
| * | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-131-13/+14
| * | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-131-0/+5
| * | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-1011-11/+11
| | |/ / / | |/| | |
* | | | | Remove redundant room_version checksErik Johnston2018-08-201-1/+1
* | | | | Revert spurious changeErik Johnston2018-08-201-2/+2
* | | | | Choose state algorithm based on room versionErik Johnston2018-08-092-4/+9
|/ / / /
* | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servletErik Johnston2018-08-092-31/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r...Erik Johnston2018-08-035-141/+210
| |\ \ \
| * | | | Use new helper base class for membership requestsErik Johnston2018-07-311-24/+17
| * | | | Use new helper base class for ReplicationSendEventRestServletErik Johnston2018-07-311-7/+4
* | | | | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-081-0/+10
|\ \ \ \ \
| * | | | | more metrics for the federation and appservice sendersRichard van der Hoff2018-08-071-0/+10
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-082-3/+38
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Don't expose default_room_version as config optRichard van der Hoff2018-08-071-1/+2
| * | | | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-061-2/+11
| * | | | Basic support for room versioningRichard van der Hoff2018-08-031-1/+26
| | |_|/ | |/| |
* | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-082-21/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | py3 fixNeil Johnson2018-08-031-1/+1
| * | | bug fixesNeil Johnson2018-08-032-17/+6
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-033-114/+140
| |\| |
| * | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-022-12/+8
* | | | Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-031-31/+58
| |/ / |/| |
* | | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-021-17/+8
|\ \ \
| * | | Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-011-17/+8
* | | | Merge branch 'master' into developRichard van der Hoff2018-08-022-10/+44
|\ \ \ \
| * | | | Check room visibility for /event/ requestsRichard van der Hoff2018-08-021-4/+21
| * | | | Avoid extra db lookupsRichard van der Hoff2018-08-021-27/+11
| * | | | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-021-1/+34
* | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-021-87/+88
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | update docsErik Johnston2018-08-011-3/+5
| * | | | _persist_auth_tree no longer returns anythingErik Johnston2018-08-011-1/+1
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_...Erik Johnston2018-07-306-30/+177
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Split out DB writes in federation handlerErik Johnston2018-07-251-83/+82
* | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-012-3/+35
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-011-14/+14
| |\ \ \ \
| * | | | | count_monthly_users() asyncNeil Johnson2018-08-011-4/+7
| * | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-011-4/+5
| * | | | | coding styleNeil Johnson2018-07-311-1/+2
| * | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-302-2/+29
| | |_|/ / | |/| | |
* | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-022-10/+21
| |/ / / |/| | |
* | | | rename replication_layer to federation_clientRichard van der Hoff2018-07-311-14/+14
|/ / /
* | | make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-272-4/+22
* | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pidRichard van der Hoff2018-07-271-0/+4
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_...Michael Telatynski2018-07-2431-1534/+3975
| |\ \ \
| * | | | if inviter_display_name == ""||None then default to inviter MXIDMichael Telatynski2018-06-131-0/+4
* | | | | Deduplicate redundant lazy-loaded members (#3331)Matthew Hodgson2018-07-261-25/+62
* | | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-261-1/+1
* | | | | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-261-14/+102
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-253-13/+21
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | clarify comment on p_idsMatthew Hodgson2018-07-241-1/+2
| * | | | | rather than adding ll_ids, remove them from p_idsMatthew Hodgson2018-07-241-5/+6
| * | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-246-282/+307
| |\ \ \ \ \
| * | | | | | incorporate more reviewMatthew Hodgson2018-07-241-3/+9