summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2190 from matrix-org/erikj/mark_remote_as_back_moreErik Johnston2017-05-052-7/+9
|\
| * Use preserve_fn and add logsErik Johnston2017-05-051-1/+3
| * Remove redundant reset of destination timersErik Johnston2017-05-051-7/+0
| * Always mark remotes as up if we receive a signed request from themErik Johnston2017-05-051-0/+7
* | Merge pull request #2189 from matrix-org/erikj/handle_remote_device_listErik Johnston2017-05-051-1/+28
|\ \
| * | CommentErik Johnston2017-05-051-0/+6
| * | Add comment and TODOErik Johnston2017-05-051-0/+6
| * | Handle exceptions thrown in handling remote device list updatesErik Johnston2017-05-051-1/+16
| |/
* | Merge pull request #2192 from matrix-org/kegan/simple-http-client-timeoutsKegsay2017-05-051-14/+21
|\ \
| * | Remember how twisted worksKegan Dougal2017-05-051-2/+2
| * | Include the clockKegan Dougal2017-05-051-0/+1
| * | Rewrite SimpleHttpClient.request to include timeoutsKegan Dougal2017-05-051-13/+19
* | | Merge pull request #2176 from matrix-org/erikj/faster_get_joinedErik Johnston2017-05-051-16/+42
|\ \ \
| * | | FixesErik Johnston2017-05-051-3/+4
| * | | Add commentErik Johnston2017-05-041-0/+3
| * | | Make get_joined_users fasterErik Johnston2017-05-031-16/+38
* | | | Merge pull request #2185 from matrix-org/erikj/smaller_cachesErik Johnston2017-05-052-11/+35
|\ \ \ \
| * | | | Optimise caches with single keyErik Johnston2017-05-041-9/+33
| * | | | Reduce size of get_users_in_roomErik Johnston2017-05-041-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #2174 from matrix-org/erikj/current_cache_hostsErik Johnston2017-05-054-5/+54
|\ \ \ \ | |_|_|/ |/| | |
| * | | Intern host stringsErik Johnston2017-05-041-1/+2
| * | | Make caches biggerErik Johnston2017-05-041-1/+1
| * | | Fix comment and num argsErik Johnston2017-05-042-2/+2
| * | | Add new storage functions to slave storeErik Johnston2017-05-041-0/+3
| * | | Add cache for get_current_hosts_in_roomErik Johnston2017-05-023-5/+50
| | |/ | |/|
* | | Revert "Prefill state caches"Erik Johnston2017-05-043-27/+9
* | | Merge pull request #2183 from matrix-org/luke/username-availabilityLuke Barnard2017-05-041-0/+41
|\ \ \ | |_|/ |/| |
| * | Appease the flake8 godsLuke Barnard2017-05-031-5/+10
| * | Implement username availability checkerLuke Barnard2017-05-031-0/+36
* | | Merge pull request #2147 from matrix-org/dbkr/http_request_propagate_errorDavid Baker2017-05-033-4/+41
|\ \ \
| * | | No need for the exception variableDavid Baker2017-05-031-1/+1
| * | | List caught expection typesDavid Baker2017-05-031-1/+1
| * | | Remove debuggingDavid Baker2017-04-261-2/+1
| * | | Revert accidental commitDavid Baker2017-04-261-4/+4
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagat...David Baker2017-04-2615-109/+209
| |\ \ \
| * | | | Fix get_jsonDavid Baker2017-04-261-5/+4
| * | | | Use CodeMessageException subclass insteadDavid Baker2017-04-254-61/+51
| * | | | Need the HTTP status codeDavid Baker2017-04-211-5/+5
| * | | | Do the same for get_jsonDavid Baker2017-04-211-8/+21
| * | | | Don't error for 3xx responsesDavid Baker2017-04-211-1/+1
| * | | | Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagat...David Baker2017-04-216-1/+167
| |\ \ \ \
| * | | | | Propagate errors sensibly from proxied IS requestsDavid Baker2017-04-213-6/+42
* | | | | | Merge pull request #2175 from matrix-org/erikj/prefill_stateErik Johnston2017-05-033-9/+27
|\ \ \ \ \ \
| * | | | | | Update commentErik Johnston2017-05-031-1/+2
| * | | | | | CommentsErik Johnston2017-05-032-3/+6
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_stateErik Johnston2017-05-036-3/+32
| |\ \ \ \ \ \
| * | | | | | | Prefill state cachesErik Johnston2017-05-023-6/+18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #2170 from matrix-org/erikj/fed_hole_stateErik Johnston2017-05-031-21/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge together redundant calculations/loggingErik Johnston2017-05-031-9/+2
| * | | | | | FixupErik Johnston2017-04-281-10/+4
| * | | | | | Remove unncessary call in _get_missing_events_for_pduErik Johnston2017-04-281-13/+11
| * | | | | | Don't fetch state for missing events that we fetchedErik Johnston2017-04-281-0/+6
* | | | | | | Merge pull request #2178 from matrix-org/erikj/message_metricsErik Johnston2017-05-025-2/+29
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add more granular event send metricsErik Johnston2017-05-025-2/+29
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2180 from matrix-org/rav/fix_timeout_on_timeoutRichard van der Hoff2017-05-021-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Instantiate DeferredTimedOutError correctlyRichard van der Hoff2017-05-021-1/+1
| |/ / / /
* | | | | Merge pull request #2080 from matrix-org/erikj/filter_speedErik Johnston2017-04-284-40/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused importErik Johnston2017-04-281-1/+0
| * | | | We don't care about forgotten roomsErik Johnston2017-04-281-12/+0
| * | | | Speed up filtering of a single event in pushErik Johnston2017-04-284-40/+37
* | | | | Merge pull request #2163 from matrix-org/erikj/fix_invite_stateErik Johnston2017-04-273-7/+26
|\ \ \ \ \
| * | | | | Comment and remove spurious loggingErik Johnston2017-04-272-1/+3
| * | | | | Fix testsErik Johnston2017-04-261-3/+3
| * | | | | Fix invite state to always include all eventsErik Johnston2017-04-263-7/+24
| |/ / / /
* | | | | Merge pull request #2127 from APwhitehat/alreadystartedErik Johnston2017-04-271-0/+3
|\ \ \ \ \
| * | | | | synctl.py: Check if synapse is already runningAnant Prakash2017-04-131-0/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #2131 from matthewjwolff/developErik Johnston2017-04-272-2/+8
|\ \ \ \ \
| * | | | | Queried CONDITIONAL_REQUIREMENTSMatthew Wolff2017-04-181-2/+5
| * | | | | Fixed travis build failureMatthew Wolff2017-04-171-3/+1
| * | | | | web_server_root documentation fixMatthew Wolff2017-04-172-2/+7
* | | | | | 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-04 23:52:40 +0000