summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix bgupdate error if index already exists (#2167)Richard van der Hoff2017-04-271-30/+53
* Merge pull request #2168 from matrix-org/erikj/federation_loggingErik Johnston2017-04-271-2/+22
|\
| * TypoErik Johnston2017-04-271-1/+1
| * Add some extra logging for edge cases of federationErik Johnston2017-04-271-2/+22
* | Merge pull request #2130 from APwhitehat/roomexistsErik Johnston2017-04-271-1/+5
|\ \ | |/ |/|
| * Check that requested room_id existsAnant Prakash2017-04-141-1/+5
* | Make state caches cache in asciiErik Johnston2017-04-251-2/+3
* | fix upErik Johnston2017-04-251-1/+2
* | Don't specify default as dictErik Johnston2017-04-251-1/+1
* | CommentErik Johnston2017-04-251-0/+2
* | Reduce size of joined_user cacheErik Johnston2017-04-254-11/+40
* | Reduce _get_state_group_for_event cache sizeErik Johnston2017-04-251-1/+1
* | Merge pull request #2158 from matrix-org/erikj/reduce_cache_sizeErik Johnston2017-04-253-24/+28
|\ \
| * | Remove DEBUG_CACHESErik Johnston2017-04-251-2/+0
| * | Reduce cache size by not storing deferredsErik Johnston2017-04-252-22/+28
* | | Fix code for reporting old verify keys in synapseMark Haines2017-04-241-3/+2
* | | Merge pull request #2145 from matrix-org/rav/reject_invite_to_unreachable_serverRichard van der Hoff2017-04-245-44/+124
|\ \ \ | |/ / |/| |
| * | Try harder when sending leave eventsRichard van der Hoff2017-04-211-1/+19
| * | Remove redundant try/except clausesRichard van der Hoff2017-04-211-23/+11
| * | Broaden the conditions for locally_rejecting invitesRichard van der Hoff2017-04-211-1/+7
| * | Remove redundant functionRichard van der Hoff2017-04-211-10/+5
| * | Fix some lies, and other clarifications, in docstringsRichard van der Hoff2017-04-213-9/+82
* | | Merge pull request #2155 from matrix-org/erikj/string_internErik Johnston2017-04-241-18/+11
|\ \ \
| * | | Only intern ascii stringsErik Johnston2017-04-241-18/+11
| |/ /
* / / Remove unused cacheErik Johnston2017-04-242-9/+1
|/ /
* | m.read_marker -> m.fully_read (#2128)Luke Barnard2017-04-183-9/+9
* | Merge pull request #2120 from matrix-org/luke/read-markersLuke Barnard2017-04-136-1/+167
|\ \ | |/ |/|
| * Correct logic in is_event_afterLuke Barnard2017-04-131-1/+1
| * Simplify is_event_after logicLuke Barnard2017-04-122-12/+6
| * More null-guard changesLuke Barnard2017-04-121-4/+4
| * Remove Unused ref to hsLuke Barnard2017-04-121-1/+0
| * Move a spaceLuke Barnard2017-04-121-2/+2
| * Only notify user, not entire roomLuke Barnard2017-04-121-3/+1
| * Remove comment, simplify null-guardLuke Barnard2017-04-121-4/+1
| * Handle no previous RMLuke Barnard2017-04-121-1/+4
| * travis flake8..Luke Barnard2017-04-111-0/+1
| * flake8Luke Barnard2017-04-111-1/+0
| * Refactor event ordering check to events storeLuke Barnard2017-04-112-28/+32
| * CopyrightLuke Barnard2017-04-111-1/+1
| * flake8Luke Barnard2017-04-113-5/+4
| * Finish implementing RM endpointLuke Barnard2017-04-115-48/+67
| * Initial commit of RM server-side impllukebarnard2017-04-112-0/+153
* | Merge pull request #2115 from matrix-org/erikj/dedupe_federation_replErik Johnston2017-04-127-130/+203
|\ \
| * | CommentErik Johnston2017-04-121-2/+1
| * | Reuse get_interested_partiesErik Johnston2017-04-122-19/+8
| * | Move get_presence_list_* to SlaveStoreErik Johnston2017-04-113-24/+13
| * | CommentErik Johnston2017-04-112-1/+9
| * | Move get_interested_partiesErik Johnston2017-04-112-38/+36
| * | CommentsErik Johnston2017-04-112-9/+10
| * | Move get_interested_remotes back to presence handlerErik Johnston2017-04-112-38/+55
| * | CommentsErik Johnston2017-04-111-1/+14
| * | Reduce federation presence replication trafficErik Johnston2017-04-106-80/+139
* | | Merge pull request #2121 from matrix-org/paul/sent-transactions-metricPaul Evans2017-04-121-0/+3
|\ \ \
| * | | Add a counter metric for successfully-sent transactionsPaul "LeoNerd" Evans2017-04-111-0/+3
* | | | Merge pull request #2116 from matrix-org/erikj/dedupe_federation_repl2Erik Johnston2017-04-121-6/+24
|\ \ \ \
| * | | | Add some commentsErik Johnston2017-04-121-0/+15
| * | | | Use generatorsErik Johnston2017-04-101-2/+2
| * | | | Dedupe KeyedEdu and Devices federation repl trafficErik Johnston2017-04-101-6/+9
| | |/ / | |/| |
* | | | Merge pull request #2117 from matrix-org/erikj/remove_http_replicationErik Johnston2017-04-125-753/+0
|\ \ \ \
| * | | | Remove HTTP replication APIsErik Johnston2017-04-115-753/+0
| |/ / /
* | | | Merge pull request #2118 from matrix-org/erikj/no_devicesErik Johnston2017-04-121-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Bail on where clause insteadErik Johnston2017-04-111-3/+4
| * | | Don't bother with outer check for nowErik Johnston2017-04-111-3/+0
| * | | Fix getting latest device IP for user with no devicesErik Johnston2017-04-111-0/+5
| | |/ | |/|
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-04-112-5/+5
|\ \ \ | |/ / |/| |
| * | When we do an invite rejection, save the signed leave event to the dbRichard van der Hoff2017-04-071-4/+4
| * | Bump version and changelogErik Johnston2017-04-071-1/+1
* | | trust a hypothetical future riot.im ISMatthew Hodgson2017-04-101-0/+1
| |/ |/|
* | TypoErik Johnston2017-04-101-1/+1
* | Merge pull request #2102 from DanielDent/add-auth-emailDavid Baker2017-04-102-1/+21
|\ \
| * | Support authenticated SMTPDaniel Dent2017-04-052-1/+21
* | | Merge pull request #2109 from matrix-org/erikj/send_queue_fixErik Johnston2017-04-103-92/+245
|\ \ \
| * | | Rename variableErik Johnston2017-04-101-7/+7
| * | | Revert to sending the same data type as beforeErik Johnston2017-04-101-2/+2
| * | | Change nameErik Johnston2017-04-101-2/+2
| * | | CommentsErik Johnston2017-04-102-6/+8
| * | | CommentErik Johnston2017-04-071-2/+15
| * | | Add loggingErik Johnston2017-04-071-0/+8
| * | | Fix up federation SendQueue and document typesErik Johnston2017-04-072-91/+221
* | | | Up replication ping timeoutErik Johnston2017-04-101-2/+4
* | | | CommentErik Johnston2017-04-071-0/+9
* | | | Speed up get_current_state_idsErik Johnston2017-04-071-10/+17
|/ / /
* | | Merge pull request #2107 from HarHarLinks/patch-1Erik Johnston2017-04-071-1/+1
|\ \ \
| * | | fix typo in synctl helpKim Brose2017-04-061-1/+1
* | | | Merge pull request #2103 from matrix-org/erikj/no-double-encodeErik Johnston2017-04-075-47/+88
|\ \ \ \
| * | | | Document types of the replication streamsErik Johnston2017-04-061-28/+76
| * | | | Don't double json encode typing replication dataErik Johnston2017-04-052-6/+2
| * | | | Don't double json encode federation replication dataErik Johnston2017-04-052-13/+10
* | | | | Use iteritemsErik Johnston2017-04-061-2/+2
* | | | | Merge pull request #2106 from matrix-org/erikj/reduce_user_syncErik Johnston2017-04-061-4/+43
|\ \ \ \ \
| * | | | | CommentErik Johnston2017-04-061-1/+1
| * | | | | DocsErik Johnston2017-04-061-0/+7
| * | | | | Don't immediately notify the master about users whose syncs have gone awayErik Johnston2017-04-051-4/+36
| |/ / / /
* | | | | Fix incorrect type when using InvalidateCacheCommandErik Johnston2017-04-061-1/+1
* | | | | Add log linesErik Johnston2017-04-051-1/+2
* | | | | Rearrange metricsErik Johnston2017-04-052-19/+31
* | | | | Fix typoErik Johnston2017-04-051-2/+2
* | | | | Fixup some metrics for tcp replErik Johnston2017-04-052-0/+19
|/ / / /
* | | | Merge pull request #2097 from matrix-org/erikj/repl_tcp_clientErik Johnston2017-04-0520-574/+580
|\ \ \ \
| * | | | Add commentErik Johnston2017-04-041-0/+5
| * | | | Add the appropriate amount of preserve_fnErik Johnston2017-04-044-17/+19
| * | | | Remove unused worker config optionErik Johnston2017-04-041-1/+0
| * | | | Shuffle and comment synchrotron presenceErik Johnston2017-04-041-9/+11
| * | | | Move where we ack federationErik Johnston2017-04-041-7/+16
| * | | | Update all the workers and master to use TCP replicationErik Johnston2017-04-039-401/+259
| * | | | Change slave storage to use new replication interfaceErik Johnston2017-04-0310-171/+106
| * | | | Add basic replication client handler and factoryErik Johnston2017-04-031-0/+196
* | | | | Deduplicate new deviceinbox rows for replicationErik Johnston2017-04-041-4/+7
| |_|/ / |/| | |
* | | | Merge pull request #2098 from matrix-org/erikj/repl_tcp_fixErik Johnston2017-04-043-6/+15
|\ \ \ \
| * | | | Advance replication streams even if nothing is listeningErik Johnston2017-04-043-6/+15
* | | | | Fiddle tcp replication loggingErik Johnston2017-04-041-2/+2
|/ / / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_s...Erik Johnston2017-04-0417-152/+228
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #2095 from matrix-org/rav/cull_log_preservesRichard van der Hoff2017-04-034-43/+31
| |\ \ \
| | * | | Remove spurious yieldRichard van der Hoff2017-04-031-1/+1
| | * | | Remove more spurious `PreserveLoggingContext`sRichard van der Hoff2017-04-031-24/+19
| | * | | Remove spurious PreserveLoggingContextRichard van der Hoff2017-04-031-6/+5
| | * | | preserve_fn some deferred-returning thingsRichard van der Hoff2017-04-031-2/+5
| | * | | Fix fixme in preserve_fnRichard van der Hoff2017-04-031-5/+1
| | * | | Remove spurious @preserve_fn decoratorsRichard van der Hoff2017-04-031-5/+0
| * | | | Merge remote-tracking branch 'origin/release-v0.20.0' into developRichard van der Hoff2017-04-032-5/+19
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Accept join events from all serversRichard van der Hoff2017-04-032-5/+19
| * | | | Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse into developErik Johnston2017-04-031-1/+1
| |\| | | | | |/ / | |/| |
| | * | Bump version and changelog v0.20.0-rc1Erik Johnston2017-03-301-1/+1
| * | | Merge pull request #2078 from APwhitehat/assertuserfriendlyErik Johnston2017-03-311-1/+2
| |\ \ \
| | * | | add user friendly report of assertion error in synctl.pyAnant Prakash2017-03-291-1/+2
| * | | | Merge pull request #2011 from matrix-org/matthew/turn_allow_guestsErik Johnston2017-03-312-1/+12
| |\ \ \ \
| | * | | | typoMatthew Hodgson2017-03-151-1/+1
| | * | | | set default for turn_allow_guests correctlyMatthew Hodgson2017-03-151-1/+1
| | * | | | add setting (on by default) to support TURN for guestsMatthew Hodgson2017-03-152-1/+12
| * | | | | Merge pull request #1986 from matrix-org/matthew/enable_guest_3pErik Johnston2017-03-311-4/+4
| |\ \ \ \ \
| | * | | | | switch to allow_guest=True for authing 3Ps as per PR feedbackMatthew Hodgson2017-03-311-0/+8
| | * | | | | enable guest access for the 3pl/3pid APIsMatthew Hodgson2017-03-121-8/+0
| * | | | | | Merge pull request #2075 from matrix-org/erikj/cache_speedErik Johnston2017-03-314-14/+45
| |\ \ \ \ \ \
| | * | | | | | Remove unused instance variableErik Johnston2017-03-311-4/+0
| | * | | | | | DocsErik Johnston2017-03-301-0/+5
| | * | | | | | Revert log context changeErik Johnston2017-03-301-3/+0
| | * | | | | | Doc new instance variablesErik Johnston2017-03-301-1/+8
| | * | | | | | Manually calculate cache key as getcallargs is expensiveErik Johnston2017-03-301-6/+28
| | * | | | | | Don't convert to deferreds when not necessaryErik Johnston2017-03-305-8/+12
| * | | | | | | Merge pull request #2076 from matrix-org/erikj/as_perfErik Johnston2017-03-311-18/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Add commentErik Johnston2017-03-291-1/+1
| | * | | | | | | Cache whether an AS is interested based on membersErik Johnston2017-03-281-1/+9
| | * | | | | | | Remove param and cast at call siteErik Johnston2017-03-281-8/+6
| | * | | | | | | Compile the regex's used in ASesErik Johnston2017-03-281-9/+5
| * | | | | | | | Speed up copy_and_replaceErik Johnston2017-03-301-3/+1
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #2079 from matrix-org/erikj/push_regex_cacheErik Johnston2017-03-301-47/+57
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Cache glob to regex at a higher level for pushErik Johnston2017-03-291-47/+57
| * | | | | | | Fix the logcontext handling in the cache wrappers (#2077)Richard van der Hoff2017-03-302-16/+37
* | | | | | | | Always advance stream tokensErik Johnston2017-04-031-1/+4
* | | | | | | | Use callbacks to notify tcp replication rather than deferredsErik Johnston2017-03-312-20/+12
* | | | | | | | Add a timestamp to USER_SYNC commandErik Johnston2017-03-314-16/+24
* | | | | | | | Fix up presenceErik Johnston2017-03-311-1/+3
* | | | | | | | Fix up docsErik Johnston2017-03-313-20/+4
* | | | | | | | Remove user from process_presence when stops syncingErik Johnston2017-03-301-0/+1
* | | | | | | | Add tcp replication listener type and hook it upErik Johnston2017-03-301-0/+11
* | | | | | | | Add functions to presence to support remote syncsErik Johnston2017-03-301-0/+66
* | | | | | | | Add server side resource for tcp replicationErik Johnston2017-03-301-0/+300
* | | | | | | | Initial TCP protocol implementationErik Johnston2017-03-303-0/+974
* | | | | | | | Define the various streams we will replicateErik Johnston2017-03-302-0/+423
* | | | | | | | Make federation send queue take the current positionErik Johnston2017-03-302-16/+26
* | | | | | | | Add a simple hook to wait for replication trafficErik Johnston2017-03-301-0/+6
* | | | | | | | Add new storage functions for new replicationErik Johnston2017-03-305-4/+137
|/ / / / / / /
* | | | | | | Use txn.fetchall() so we can reuse txnErik Johnston2017-03-301-1/+1
* | | | | | | synctl.py: wait for synapse to stop before restarting (#2020)Anant Prakash2017-03-291-4/+43
|/ / / / / /
* | | | / / Increase cache size for _get_state_group_for_eventErik Johnston2017-03-291-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1849 from matrix-org/erikj/state_typoErik Johnston2017-03-291-3/+3
|\ \ \ \ \
| * | | | | Fix bug where current_state_events renamed to current_state_idsErik Johnston2017-01-231-3/+3
* | | | | | Bail early if remote wouldn't be retried (#2064)Erik Johnston2017-03-291-2/+8
* | | | | | Merge pull request #2053 from matrix-org/erikj/e2e_one_time_upsertErik Johnston2017-03-291-9/+50
|\ \ \ \ \ \
| * | | | | | Decrank last commitErik Johnston2017-03-291-4/+5
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_ti...Erik Johnston2017-03-2937-588/+717
| |\ \ \ \ \ \
| * | | | | | | Correctly look up keyErik Johnston2017-03-291-6/+5
| * | | | | | | The algorithm is part of the key idErik Johnston2017-03-281-4/+4
| * | | | | | | Raise a more helpful exceptionErik Johnston2017-03-231-2/+4
| * | | | | | | Don't user upsert to persist new one time keysErik Johnston2017-03-231-9/+48
* | | | | | | | Merge pull request #2067 from matrix-org/erikj/notify_on_fedErik Johnston2017-03-291-0/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Notify on new federation trafficErik Johnston2017-03-271-0/+7
* | | | | | | | Merge pull request #2063 from matrix-org/erikj/device_list_batchErik Johnston2017-03-282-0/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Batch sending of device list pokesErik Johnston2017-03-242-0/+5
| |/ / / / / /
* | | | | | | TypoErik Johnston2017-03-271-1/+1
* | | | | | | Short circuit if all new events have same state groupErik Johnston2017-03-271-36/+51
|/ / / / / /
* | | | | | Merge pull request #2062 from matrix-org/erikj/presence_replicationErik Johnston2017-03-242-2/+3
|\ \ \ \ \ \
| * | | | | | Actually call invalidateErik Johnston2017-03-241-1/+1
| * | | | | | Use presence replication stream to invalidate cacheErik Johnston2017-03-242-2/+3
* | | | | | | Merge pull request #2061 from matrix-org/erikj/add_transaction_storeErik Johnston2017-03-242-0/+4
|\| | | | | |
| * | | | | | Add slave transaction storeErik Johnston2017-03-242-0/+4
* | | | | | | Merge pull request #2060 from matrix-org/erikj/cache_hosts_in_roomErik Johnston2017-03-242-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Cache hosts in roomErik Johnston2017-03-242-2/+11
| |/ / / / / /
* | | | | | | Merge pull request #2058 from matrix-org/rav/logcontext_leaks_2Richard van der Hoff2017-03-241-12/+16
|\ \ \ \ \ \ \
| * | | | | | | try not to drop context after federation requestsRichard van der Hoff2017-03-231-12/+16
* | | | | | | | Merge pull request #2057 from matrix-org/rav/missing_yield_2Richard van der Hoff2017-03-241-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add another missing yield on check_device_registeredRichard van der Hoff2017-03-231-1/+1
* | | | | | | | Merge pull request #2054 from matrix-org/erikj/user_iter_cursorErik Johnston2017-03-2417-129/+99
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace some calls to cursor_to_dictErik Johnston2017-03-243-39/+13
| * | | | | | | | Use iter(items|values)Erik Johnston2017-03-243-51/+48
| * | | | | | | | User Cursor.__iter__ instead of fetchallErik Johnston2017-03-2315-39/+38
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2055 from matrix-org/dbkr/fix_add_msisdn_requestTokenDavid Baker2017-03-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Oops, remove unintentional changeDavid Baker2017-03-231-7/+0
| * | | | | | | | Fix token request for addition of phone numbersDavid Baker2017-03-232-1/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2056 from matrix-org/dbkr/fix_invite_rejectDavid Baker2017-03-241-0/+7
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix rejection of invites not reaching syncDavid Baker2017-03-231-0/+7
| |/ / / / / /
* | | | | | | Merge pull request #2050 from matrix-org/rav/federation_backoffRichard van der Hoff2017-03-239-314/+350
|\ \ \ \ \ \ \
| * | | | | | | Ignore backoff history for invites, aliases, and roomdirsRichard van der Hoff2017-03-236-14/+52
| * | | | | | | push federation retry limiter down to matrixfederationclientRichard van der Hoff2017-03-237-287/+278
| * | | | | | | MatrixFederationHttpClient: clean upRichard van der Hoff2017-03-231-17/+24
* | | | | | | | Merge pull request #2052 from matrix-org/rav/time_bound_deferredRichard van der Hoff2017-03-231-4/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix time_bound_deferred to throw the right exceptionRichard van der Hoff2017-03-231-4/+6
| |/ / / / / /
* | | | | | | Add jsonschema to python_dependencies.pypik2017-03-231-0/+1
* | | | | | | use jsonschema.FormatChecker for RoomID and UserID stringspik2017-03-231-18/+27
* | | | | | | Add valid filter tests, flake8, fix typopik2017-03-231-5/+6
* | | | | | | check_valid_filter using JSONSchemapik2017-03-231-93/+158
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #2048 from matrix-org/rav/missing_yieldRichard van der Hoff2017-03-231-1/+1
|\ \ \ \ \ \
| * | | | | | Add a missing yield in device key uploadRichard van der Hoff2017-03-231-1/+1
* | | | | | | Fix a couple of logcontext leaksRichard van der Hoff2017-03-232-5/+5
|/ / / / / /
* | | | | | Merge pull request #2044 from matrix-org/rav/crypto_docsRichard van der Hoff2017-03-222-4/+24
|\ \ \ \ \ \
| * | | | | | fix up some key verif docstringsRichard van der Hoff2017-03-212-4/+24
* | | | | | | Merge pull request #2042 from matrix-org/rav/fix_key_cachingRichard van der Hoff2017-03-221-63/+72
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix caching of remote servers' signature keysRichard van der Hoff2017-03-221-63/+72
| |/ / / / /
* | | | | | Merge branch 'master' into developMatthew Hodgson2017-03-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Bump changelog and version release-v0.19.3Erik Johnston2017-03-201-1/+1
| * | | | Bump changelog and versions v0.19.3-rc2Erik Johnston2017-03-131-1/+1
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3Erik Johnston2017-03-1339-223/+1320
| |\ \ \ \
| * | | | | Bump changelog and versionErik Johnston2017-03-081-1/+1
* | | | | | Merge pull request #2033 from matrix-org/erikj/repl_speedErik Johnston2017-03-214-53/+38
|\ \ \ \ \ \
| * | | | | | PEP8Erik Johnston2017-03-202-3/+0
| * | | | | | Don't send the full event json over replicationErik Johnston2017-03-174-50/+38
* | | | | | | Add some debug to help diagnose weird federation issueRichard van der Hoff2017-03-201-1/+8
* | | | | | | Merge pull request #2026 from matrix-org/rav/logcontext_docsRichard van der Hoff2017-03-201-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Logcontext docsRichard van der Hoff2017-03-171-0/+10
| |/ / / / / /
* | | | | | | Merge pull request #2027 from matrix-org/rav/logcontext_leaksRichard van der Hoff2017-03-2011-62/+86
|\ \ \ \ \ \ \
| * | | | | | | Stop preserve_fn leaking context into the reactorRichard van der Hoff2017-03-182-34/+32
| * | | | | | | Run the reactor with the sentinel logcontextRichard van der Hoff2017-03-188-16/+51
| * | | | | | | Remove broken use of clock.call_laterRichard van der Hoff2017-03-181-12/+3
| |/ / / / / /
* | | | | | | Avoid resetting state on rejected eventsRichard van der Hoff2017-03-172-4/+14
* | | | | | | Refactoring and cleanupsRichard van der Hoff2017-03-175-80/+264
|/ / / / / /
* | | | | | Merge pull request #2016 from matrix-org/rav/queue_pdus_during_joinRichard van der Hoff2017-03-172-24/+69
|\ \ \ \ \ \
| * | | | | | Queue up federation PDUs while a room join is in progressRichard van der Hoff2017-03-151-24/+44
| * | | | | | Implement reset_context_after_deferredRichard van der Hoff2017-03-151-0/+25
* | | | | | | CommentsErik Johnston2017-03-162-2/+4
* | | | | | | CommentErik Johnston2017-03-161-3/+8
* | | | | | | Don't recreate so many setsErik Johnston2017-03-1610-51/+42
* | | | | | | Implement no op for room stream in syncErik Johnston2017-03-161-4/+47
* | | | | | | Merge pull request #2014 from Half-Shot/hs/fix-appservice-presenceErik Johnston2017-03-151-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Add a great comment to handle_timeout for active vs sync times.Will Hunt2017-03-151-0/+2
| * | | | | | | Add fallback to last_active_ts if it beats the last sync time.Will Hunt2017-03-151-1/+2
* | | | | | | | CommentErik Johnston2017-03-151-1/+3
* | | | | | | | Cache set of users whose presence the other user should seeErik Johnston2017-03-151-13/+27
* | | | | | | | CommentErik Johnston2017-03-152-0/+6
* | | | | | | | Remove unused importErik Johnston2017-03-151-1/+0
* | | | | | | | Format presence events on the edges instead of reformatting them multiple timesErik Johnston2017-03-157-39/+80