summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-253-13/+21
|\
| * Fix updating of cached remote profilesRichard van der Hoff2018-07-251-1/+8
| * Replace usage of get_current_toke with StreamToken.STARTErik Johnston2018-07-241-5/+7
| * Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groupsRichard van der Hoff2018-07-241-7/+6
| |\
| | * Handle delta_ids being None in _update_context_for_auth_eventsRichard van der Hoff2018-07-231-7/+6
* | | 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
|\| |
| * | Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-244-264/+282
| |\ \
| | * | Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-244-32/+66
| | |\|
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api...Erik Johnston2018-07-232-11/+11
| | |\ \
| | * | | Move PaginationHandler to its own fileErik Johnston2018-07-202-240/+267
| | * | | Move check_in_room_or_world_readable to AuthErik Johnston2018-07-201-34/+6
| | * | | Move RoomContextHandler out of HandlersErik Johnston2018-07-182-3/+5
| | * | | Split MessageHandler into read only and writersErik Johnston2018-07-182-133/+150
| * | | | another couple of logcontext leaksRichard van der Hoff2018-07-242-5/+10
| * | | | Logcontext fixesRichard van der Hoff2018-07-241-13/+15
| | |_|/ | |/| |
* | | | incorporate more reviewMatthew Hodgson2018-07-241-3/+9
* | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-234-43/+77
|\| | |
| * | | Fix missing attributes on workers.Erik Johnston2018-07-231-2/+3
| * | | Add support for updating stateErik Johnston2018-07-231-9/+23
| * | | Use new gettersErik Johnston2018-07-234-21/+40
| | |/ | |/|
| * | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-211-9/+9
| * | Combine Limiter and LinearizerRichard van der Hoff2018-07-201-2/+2
| * | Improvements to the LimiterRichard van der Hoff2018-07-201-1/+1
| |/
* | incorporate reviewMatthew Hodgson2018-07-231-40/+27
* | incorporate reviewMatthew Hodgson2018-07-191-17/+27
* | add a filtered_types param to limit filtering to specific typesMatthew Hodgson2018-07-191-29/+36
* | merge develop pydoc for _get_state_for_groupsMatthew Hodgson2018-07-1930-416/+441
|\|
| * Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacksRichard van der Hoff2018-07-181-43/+0
| |\
| | * Merge branch 'develop' into rav/drop_re_signing_hacksRichard van der Hoff2018-07-0412-111/+313
| | |\
| | * | Remove event re-signing hacksRichard van der Hoff2018-06-071-43/+0
| * | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-171-138/+6
| |\ \ \
| | * | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-161-138/+6
| * | | | typoMatthew Hodgson2018-07-131-3/+3
| |/ / /
| * | | s/becuase/because/gMatthew Hodgson2018-07-102-2/+2
| * | | run isortAmber Brown2018-07-0930-184/+186
| | |/ | |/|
| * | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checkingErik Johnston2018-06-291-28/+68
| |\ \
| | * | try and clean upAmber Brown2018-06-271-3/+6
| | * | pep8Amber Brown2018-06-271-6/+4
| | * | cleanupsAmber Brown2018-06-271-13/+15
| | * | handle federation not telling us about prev_eventsAmber Brown2018-06-271-25/+62
| * | | Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-284-9/+8
| |/ /
| * | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-apiMatthew Hodgson2018-06-261-0/+1
| |\ \
| | * | add GDPR erase param to deactivate APIMatthew Hodgson2018-06-261-0/+1
| * | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-partsErik Johnston2018-06-251-2/+6
| |\ \ \
| | * | | allow non-consented users to still part rooms (to let us autopart them)Matthew Hodgson2018-06-251-2/+6
| | |/ /
| * | | Actually fix itErik Johnston2018-06-251-3/+3
| * | | CommentErik Johnston2018-06-251-0/+8
| * | | Fix bug with assuming wrong typeErik Johnston2018-06-251-2/+2
| * | | Add fast path to _filter_events_for_serverErik Johnston2018-06-251-1/+34
| |/ /
| * | typosMatthew Hodgson2018-06-251-1/+1
| * | typoMatthew Hodgson2018-06-251-1/+1
| * | Merge pull request #3441 from matrix-org/erikj/redo_erasureErik Johnston2018-06-252-1/+19
| |\ \
| | * | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili...Erik Johnston2018-06-252-1/+19
| * | | Remove all global reactor imports & pass it around explicitly (#3424)Amber Brown2018-06-253-6/+6
| |/ /
| * | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"Richard van der Hoff2018-06-222-19/+1
| * | Also log number of events for serach contextErik Johnston2018-06-221-0/+5
| * | Add some logging to search queriesErik Johnston2018-06-221-0/+9
| * | Merge pull request #3431 from matrix-org/rav/erasure_visibilityErik Johnston2018-06-222-1/+19
| |\ \
| | * | Filter out erased messagesRichard van der Hoff2018-06-121-0/+13
| | * | mark accounts as erased when requestedRichard van der Hoff2018-06-121-1/+6
| * | | Merge pull request #3428 from matrix-org/erikj/persisted_pduErik Johnston2018-06-221-18/+26
| |\| |
| | * | simplify get_persisted_pduRichard van der Hoff2018-06-121-18/+26
| * | | Pass around the reactor explicitly (#3385)Amber Brown2018-06-223-15/+25
| * | | Merge pull request #3399 from costacruise/masterRichard van der Hoff2018-06-201-2/+6
| |\ \ \
| | * | | Add error code to room creation errorMichael Wagner2018-06-141-2/+6
| | * | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
| | | |/ | | |/|
| * | | Remove run_on_reactor (#3395)Amber Brown2018-06-145-26/+5
| | |/ | |/|
| * | Merge pull request #3276 from matrix-org/dbkr/unbindDavid Baker2018-06-113-2/+82
| |\ \
| | * | doc fixesDavid Baker2018-06-051-1/+1
| | * | Fix commentDavid Baker2018-06-041-1/+1
| | * | Missing yieldDavid Baker2018-06-041-1/+1
| | * | docstringDavid Baker2018-06-041-1/+9
| | * | Merge remote-tracking branch 'origin/develop' into dbkr/unbindDavid Baker2018-05-245-16/+46
| | |\ \
| | * | | pep8David Baker2018-05-243-7/+12
| | * | | commentDavid Baker2018-05-241-0/+4
| | * | | Unbind 3pids when they're deleted tooDavid Baker2018-05-241-0/+8
| | * | | Hit the 3pid unbind endpoint on deactivationDavid Baker2018-05-232-1/+56
* | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-101-0/+4
|\| | | |
| * | | | Fix event filtering in get_missing_events handlerRichard van der Hoff2018-06-081-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0411-30/+45
|\| | |
| * | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'...Amber Brown2018-05-3110-29/+31
| * | | Update some comments and docstrings in SyncHandlerRichard van der Hoff2018-05-291-1/+11
| * | | Exempt AS-registered users from doing gdprRichard van der Hoff2018-05-291-0/+3
* | | | more commentsMatthew Hodgson2018-06-041-0/+7
* | | | add pydocMatthew Hodgson2018-05-291-5/+13
* | | | merge developMatthew Hodgson2018-05-2920-472/+970
|\| | |
| * | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2810-61/+105
| |\ \ \
| | * \ \ Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_roomRichard van der Hoff2018-05-251-10/+14
| | |\ \ \
| | | * | | Let users leave the server notice room after joiningRichard van der Hoff2018-05-251-10/+14
| | * | | | Misc. py3 fixesAdrian Tschira2018-05-242-8/+10
| | * | | | Merge pull request #3244 from NotAFile/py3-six-4Amber Brown2018-05-246-27/+35
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | replace some iteritems with sixAdrian Tschira2018-05-196-27/+35
| | * | | | Remove users from user directory on deactivateDavid Baker2018-05-242-0/+11
| | * | | | Merge pull request #3261 from matrix-org/erikj/pagination_fixesErik Johnston2018-05-241-9/+22
| | |\ \ \ \
| | | * | | | Use iter* methodsErik Johnston2018-05-221-7/+7
| | | * | | | Fix that states is a dict of dictsErik Johnston2018-05-221-1/+4
| | | * | | | get_domains_from_state returns list of tuplesErik Johnston2018-05-221-2/+12
| | * | | | | Merge pull request #3267 from matrix-org/erikj/iter_filterErik Johnston2018-05-241-5/+5
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | s/values/itervalues/Erik Johnston2018-05-231-1/+1
| | | * | | | Use iter* methods for _filter_events_for_serverErik Johnston2018-05-231-4/+4
| | * | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uriRichard van der Hoff2018-05-231-1/+4
| | |\ \ \ \ \
| | | * | | | | Support for putting %(consent_uri)s in messagesRichard van der Hoff2018-05-231-1/+4
| | | |/ / / /
| | * / / / / Use the localpart in the consent uriRichard van der Hoff2018-05-231-1/+3
| | |/ / / /
| | * | | / custom error code for not leaving server notices roomRichard van der Hoff2018-05-221-0/+1
| | | |_|/ | | |/| |
| | * | | comment typoDavid Baker2018-05-221-1/+1
| * | | | cleanupAmber Brown2018-05-222-7/+14
| * | | | cleanups, self-registrationAmber Brown2018-05-221-3/+4
| * | | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-228-75/+192
| |\| | |
| | * | | Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-222-1/+89
| | |/ /
| | * | Stub out ServerNoticesSender on the workersRichard van der Hoff2018-05-222-4/+5
| | * | Send users a server notice about consentRichard van der Hoff2018-05-221-1/+9
| | |/
| | * Merge pull request #3232 from matrix-org/rav/server_notices_roomRichard van der Hoff2018-05-184-6/+80
| | |\
| | | * Make sure we reject attempts to invite the notices userRichard van der Hoff2018-05-182-0/+15
| | | * fix missing yield for server_notices_roomRichard van der Hoff2018-05-171-3/+4
| | | * Infrastructure for a server notices roomRichard van der Hoff2018-05-173-6/+64
| | * | Merge pull request #3233 from matrix-org/rav/remove_dead_codeRichard van der Hoff2018-05-181-55/+0
| | |\ \
| | | * | Remove unused `update_external_syncs`Richard van der Hoff2018-05-171-55/+0
| | | |/
| | * | Merge pull request #3221 from matrix-org/erikj/purge_tokenErik Johnston2018-05-181-6/+6
| | |\ \ | | | |/ | | |/|
| | | * Make purge_history operate on tokensErik Johnston2018-05-151-6/+6
| | * | Move RoomCreationHandler out of synapse.handlers.HandlersRichard van der Hoff2018-05-172-6/+7
| | |/
| * / replacing portionsAmber Brown2018-05-212-42/+35
| |/
| * Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivateDavid Baker2018-05-141-2/+79
| |\
| | * Catch failure to part user from roomDavid Baker2018-05-101-7/+13
| | * Many docstringsDavid Baker2018-05-101-0/+24
| | * Oops, don't call function passed to run_in_backgroundDavid Baker2018-05-101-1/+1
| | * Prefix internal functionsDavid Baker2018-05-091-7/+7
| | * Indent failDavid Baker2018-05-091-1/+1
| | * Part deactivated users in the backgroundDavid Baker2018-05-091-1/+34
| | * Part user from rooms on account deactivateDavid Baker2018-05-081-1/+15
| * | Merge pull request #3199 from matrix-org/erikj/pagination_syncErik Johnston2018-05-091-6/+18
| |\ \
| | * | Add comment to sync as to why code path is splitErik Johnston2018-05-091-0/+5
| | * | Refactor sync APIs to reuse pagination APIErik Johnston2018-05-091-6/+13
| * | | Fix returned token is no longer a tupleErik Johnston2018-05-091-1/+1
| |/ /
| * / Refactor get_recent_events_for_room return typeErik Johnston2018-05-092-6/+6
| |/
| * Merge branch 'release-v0.28.1' into developRichard van der Hoff2018-05-011-1/+5
| |\
| | * Apply some limits to depth to counter abuseRichard van der Hoff2018-05-011-1/+5
| * | Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fnRichard van der Hoff2018-04-301-4/+2
| |\ \
| | * | Remove redundant call to preserve_fnRichard van der Hoff2018-04-301-4/+2
| * | | Merge pull request #3153 from NotAFile/py3-httplibRichard van der Hoff2018-04-301-3/+3
| |\ \ \
| | * | | move httplib import to sixAdrian Tschira2018-04-281-3/+3
| * | | | Merge pull request #3151 from NotAFile/py3-xrange-1Richard van der Hoff2018-04-301-1/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into py3-xrange-1Richard van der Hoff2018-04-306-21/+32
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Move more xrange to sixAdrian Tschira2018-04-281-1/+3
| | | |/ / | | |/| |
| * | | | Merge pull request #3150 from NotAFile/py3-listcomp-yieldRichard van der Hoff2018-04-301-5/+9
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Don't yield in list comprehensionsAdrian Tschira2018-04-281-5/+9
| | |/ /
| * | | pep8; remove spurious importRichard van der Hoff2018-04-271-1/+1
| * | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_backgroundRichard van der Hoff2018-04-276-74/+112
| |\| |
| | * | Merge pull request #3142 from matrix-org/rav/reraiseRichard van der Hoff2018-04-272-13/+24
| | |\ \
| | | * | reraise exceptions more carefullyRichard van der Hoff2018-04-272-13/+24
| | | |/
| | * | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptionsRichard van der Hoff2018-04-274-59/+86
| | |\ \
| | | * | Improve exception handling for background processesRichard van der Hoff2018-04-274-59/+86
| | | |/
| | * / Add missing consumeErrorsRichard van der Hoff2018-04-271-2/+2
| | |/
| * / Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-276-20/+31
| |/
| * Merge pull request #3118 from matrix-org/rav/reject_prev_eventsRichard van der Hoff2018-04-231-7/+71
| |\
| | * Remove spurious paramRichard van der Hoff2018-04-231-1/+0
| | * accept stupid events over backfillRichard van der Hoff2018-04-201-4/+9
| | * Add some commentsRichard van der Hoff2018-04-181-3/+12
| | * Check events on backfill tooRichard van der Hoff2018-04-181-15/+42
| | * Reject events which have too many auth_events or prev_eventsRichard van der Hoff2018-04-181-4/+28
| * | Merge pull request #3107 from NotAFile/py3-bool-nonzeroRichard van der Hoff2018-04-201-0/+7
| |\ \
| | * | add __bool__ alias to __nonzero__ methodsAdrian Tschira2018-04-151-0/+7
| | |/
| * | Merge pull request #3093 from matrix-org/rav/response_cache_wrapRichard van der Hoff2018-04-202-35/+19
| |\ \
| | * | Refactor ResponseCache usageRichard van der Hoff2018-04-122-35/+19
| | |/
| * | Merge pull request #3117 from matrix-org/rav/refactor_have_eventsRichard van der Hoff2018-04-201-19/+12
| |\ \
| | * | Refactor store.have_eventsRichard van der Hoff2018-04-201-19/+12
| | |/
| * / Avoid creating events with huge numbers of prev_eventsRichard van der Hoff2018-04-162-38/+53
| |/
| * Merge pull request #3092 from matrix-org/rav/response_cache_metricsRichard van der Hoff2018-04-122-3/+4
| |\
| | * Add metrics for ResponseCacheRichard van der Hoff2018-04-102-3/+4
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/processed_...Erik Johnston2018-04-121-2/+19
| |\ \
| | * \ Merge pull request #3088 from matrix-org/erikj/as_parallelErik Johnston2018-04-121-2/+19
| | |\ \
| | | * | Send events to ASes concurrentlyErik Johnston2018-04-111-2/+19
| * | | | Set all metrics at the same timeErik Johnston2018-04-121-4/+4
| * | | | Track last processed event received_tsErik Johnston2018-04-111-0/+10
| * | | | Track where event stream processing have gotten up toErik Johnston2018-04-111-0/+4
| |/ / /
| * | | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sendsErik Johnston2018-04-101-49/+55
| |\ \ \ | | |/ / | |/| |
| | * | Note why we're limiting concurrent event sendsErik Johnston2018-04-101-0/+5
| | * | Limit concurrent event sends for a roomErik Johnston2018-04-091-49/+50
| * | | Merge pull request #2996 from krombel/allow_auto_join_roomsRichard van der Hoff2018-04-101-2/+34
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'develop' of into allow_auto_join_roomsKrombel2018-03-283-8/+14
| | |\ \
| | * | | move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-141-2/+34
| * | | | Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoinRichard van der Hoff2018-04-091-0/+8
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Return a 404 rather than a 500 on rejoining empty roomsRichard van der Hoff2018-04-091-0/+8
| * | | | Implement group join APIDavid Baker2018-04-061-1/+39
| |/ / /
| * | | Merge pull request #3045 from matrix-org/dbkr/group_joinableLuke Barnard2018-04-051-0/+3
| |\ \ \
| | * | | Use join_policy API instead of joinableLuke Barnard2018-04-031-1/+1
| | * | | Add joinability for groupsDavid Baker2018-03-281-0/+3
| * | | | Merge pull request #3000 from NotAFile/change-except-styleRichard van der Hoff2018-04-041-3/+3
| |\ \ \ \
| | * | | | replace old style error catching with 'as' keywordNotAFile2018-03-151-3/+3
| | | |/ / | | |/| |
| * | | | Merge pull request #3049 from matrix-org/rav/use_staticjsonRichard van der Hoff2018-04-031-2/+2
| |\ \ \ \
| | * | | | Use static JSONEncodersRichard van der Hoff2018-03-291-2/+2
| * | | | | Use simplejson throughoutRichard van der Hoff2018-03-291-3/+5
| |/ / / /
| * | | | Merge pull request #3034 from matrix-org/rav/fix_key_claim_errorsRichard van der Hoff2018-03-281-28/+28
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Stringify exceptions for keys/{query,claim}Richard van der Hoff2018-03-271-1/+4
| | * | | factor out exception handling for keys/claim and keys/queryRichard van der Hoff2018-03-271-28/+25
| | | |/ | | |/|
| * | | Also do check inside linearizerErik Johnston2018-03-271-3/+4
| * | | PEP8Erik Johnston2018-03-261-1/+3
| * | | Linearize calls to _generate_user_idErik Johnston2018-03-261-4/+7
| |/ /
| * | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-192-4/+4
| |\ \ | | |/ | |/|
| | * Replace ujson with simplejsonErik Johnston2018-03-152-4/+4
* | | make lazy_load_members configurable in filtersMatthew Hodgson2018-03-191-9/+9
* | | reshuffle todo & commentsMatthew Hodgson2018-03-191-2/+10
* | | only get member state IDs for incremental syncs if we're filteringMatthew Hodgson2018-03-181-5/+5
* | | remove debugMatthew Hodgson2018-03-161-4/+0
* | | fix tsm search againMatthew Hodgson2018-03-161-5/+4
* | | add state_ids for timeline entriesMatthew Hodgson2018-03-161-4/+14
* | | simplify timeline_start_membersMatthew Hodgson2018-03-161-14/+13
* | | make incr syncs workMatthew Hodgson2018-03-161-3/+4
* | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-03-143-101/+293
|\| |
| * | Merge pull request #2992 from matrix-org/erikj/implement_member_workreErik Johnston2018-03-141-0/+102
| |\ \
| | * | s/join/joined/ in notify_user_membership_changeErik Johnston2018-03-141-1/+1
| | * | Split RoomMemberWorkerHandler to separate fileErik Johnston2018-03-142-78/+102
| | * | Implement RoomMemberWorkerHandlerErik Johnston2018-03-131-0/+78
| * | | Merge pull request #2989 from matrix-org/erikj/profile_cache_masterErik Johnston2018-03-141-1/+4
| |\ \ \
| | * | | Only update remote profile cache on masterErik Johnston2018-03-131-1/+4
| * | | | _remote_join and co take a requesterErik Johnston2018-03-131-4/+4
| | |/ / | |/| |
| * | | Merge pull request #2987 from matrix-org/erikj/split_room_member_handlerErik Johnston2018-03-131-98/+185
| |\ \ \ | | |/ / | |/| |
| | * | Add missing param to docstringsErik Johnston2018-03-131-0/+3
| | * | Correct import orderErik Johnston2018-03-131-3/+3
| | * | Move user_*_room distributor stuff to master classErik Johnston2018-03-131-5/+50
| | * | Split RoomMemberHandler into base and master classErik Johnston2018-03-131-96/+135
* | | | add copyright to nudge CIMatthew Hodgson2018-03-141-1/+2
* | | | oopsMatthew Hodgson2018-03-131-1/+1
* | | | make it workMatthew Hodgson2018-03-131-3/+3
* | | | merge proper fix to bug 2969Matthew Hodgson2018-03-1313-73/+223
|\| | |
| * | | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layerErik Johnston2018-03-136-6/+6
| |\ \ \
| | * | | s/replication_client/federation_client/Erik Johnston2018-03-136-6/+6
| * | | | Merge pull request #2981 from matrix-org/erikj/factor_remote_leaveErik Johnston2018-03-131-22/+54
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_rem...Erik Johnston2018-03-1311-31/+49
| | |\ \ \
| | * | | | Add docstringErik Johnston2018-03-131-0/+26
| | * | | | Factor out _remote_reject_invite in RoomMemberErik Johnston2018-03-131-22/+28
| * | | | | Merge pull request #2979 from matrix-org/erikj/no_handlersErik Johnston2018-03-138-12/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | Split replication layer into twoErik Johnston2018-03-138-12/+7
| * | | | Merge pull request #2980 from matrix-org/erikj/rm_privErik Johnston2018-03-131-7/+7
| |\ \ \ \
| | * | | | Make functions private that can beErik Johnston2018-03-131-7/+7
| | | |/ / | | |/| |
| * | | | Merge pull request #2982 from matrix-org/erikj/fix_extra_usersErik Johnston2018-03-131-1/+1
| |\ \ \ \
| | * | | | extra_users is actually a list of UserIDsErik Johnston2018-03-131-1/+1
| | |/ / /
| * | | | Merge pull request #2983 from matrix-org/erikj/rename_register_3pidErik Johnston2018-03-132-11/+25
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Refactor get_or_register_3pid_guestErik Johnston2018-03-132-11/+25
| | |/ /
| * / / Split out edu/query registration to a separate classErik Johnston2018-03-138-12/+16
| |/ /
| * | Add transactional API to history purgeRichard van der Hoff2018-03-121-5/+99
| * | Return an error when doing two purges on a roomRichard van der Hoff2018-03-121-3/+14
* | | ensure we always include the members for a given timeline blockMatthew Hodgson2018-03-131-4/+32
* | | typosMatthew Hodgson2018-03-111-2/+2
* | | WIP experiment in lazyloading room membersMatthew Hodgson2018-03-111-12/+31
|/ /
* | Fix up log messageErik Johnston2018-03-071-1/+1
* | Fix typoErik Johnston2018-03-071-2/+2
* | Fix race in sync when joining roomErik Johnston2018-03-071-28/+75
* | Merge pull request #2949 from krombel/use_bcrypt_checkpwRichard van der Hoff2018-03-061-2/+4
|\ \