summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Fix typing testsErik Johnston2017-05-262-7/+7
| | * | | | Faster cache for get_joined_hostsErik Johnston2017-05-255-29/+117
| | * | | | Don't return weird prev_groupErik Johnston2017-05-251-8/+13
| | * | | | Remove unused optionsErik Johnston2017-05-251-11/+4
| * | | | | Add some logging to user directoryErik Johnston2017-06-071-0/+7
| * | | | | Merge pull request #2256 from matrix-org/erikj/faster_device_updatesErik Johnston2017-06-072-13/+65
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | When pruning, delete from device_lists_outbound_last_successErik Johnston2017-06-071-0/+8
| | * | | | Keep pruning background taskErik Johnston2017-06-071-0/+45
| | * | | | Split up device_lists_outbound_pokes table for faster updates.Erik Johnston2017-06-072-58/+57
| |/ / / /
| * | | / Increase size of IP cacheErik Johnston2017-06-071-1/+6
| | |_|/ | |/| |
| * | | Fix typo when getting app nameErik Johnston2017-06-061-1/+1
| * | | Fix wrong number of argumentsErik Johnston2017-06-061-1/+1
| * | | Merge pull request #2253 from matrix-org/erikj/user_dirErik Johnston2017-06-012-0/+74
| |\ \ \
| | * | | Handle profile updates in user directoryErik Johnston2017-06-012-0/+74
| * | | | Merge pull request #2252 from matrix-org/erikj/user_dirErik Johnston2017-06-0113-1/+1043
| |\| | |
| | * | | Fix sqliteErik Johnston2017-06-011-1/+1
| | * | | Split the table in twoErik Johnston2017-06-014-31/+138
| | * | | Tweak search queryErik Johnston2017-06-011-1/+1
| | * | | Tweak search queryErik Johnston2017-06-011-2/+2
| | * | | CommentsErik Johnston2017-06-011-3/+3
| | * | | Check if host is still in roomErik Johnston2017-06-011-0/+11
| | * | | Remove spurious inlineCallbacksErik Johnston2017-06-011-1/+0
| | * | | Fix removing usersErik Johnston2017-06-011-0/+5
| | * | | Bug fixes and loggingErik Johnston2017-06-012-2/+22
| | * | | Order by if they have profile infoErik Johnston2017-06-011-2/+11
| | * | | Use prefix matchingErik Johnston2017-06-011-5/+29
| | * | | Comment on why arbitrary commentsErik Johnston2017-05-311-2/+6
| | * | | Use unique indicesErik Johnston2017-05-311-2/+2
| | * | | Comment briefly on how we keep user_directory up to dateErik Johnston2017-05-311-0/+10
| | * | | Convert to intErik Johnston2017-05-311-0/+1
| | * | | Lifts things into separate functionErik Johnston2017-05-311-56/+54
| | * | | TyposErik Johnston2017-05-311-8/+8
| | * | | Fix testsErik Johnston2017-05-312-2/+3
| | * | | Fix typoErik Johnston2017-05-311-1/+1
| | * | | Limit number of things we fetch out of the dbErik Johnston2017-05-311-9/+30
| | * | | Add stream change cacheErik Johnston2017-05-314-1/+34
| | * | | Split out directory and search tablesErik Johnston2017-05-312-29/+56
| | * | | Pull max id from correct tableErik Johnston2017-05-312-4/+10
| | * | | Handle the server leaving a public roomErik Johnston2017-05-314-3/+46
| | * | | Add commentsErik Johnston2017-05-314-45/+173
| | * | | Weight differentlyErik Johnston2017-05-312-10/+31
| | * | | Use POSTErik Johnston2017-05-311-1/+1
| | * | | Add REST APIErik Johnston2017-05-312-0/+61
| | * | | Add searchErik Johnston2017-05-312-0/+38
| | * | | Update room column when room becomes unpublicErik Johnston2017-05-312-2/+31
| | * | | Add call laterErik Johnston2017-05-311-0/+2
| | * | | Start laterErik Johnston2017-05-311-1/+4
| | * | | Don't go round in circlesErik Johnston2017-05-311-4/+2
| | * | | Add user_directory to databaseErik Johnston2017-05-316-1/+444
| |/ / /
| * | | Merge pull request #2251 from matrix-org/erikj/current_state_delta_streamErik Johnston2017-05-302-8/+50
| |\ \ \ | | |/ / | |/| |
| | * | Add commentErik Johnston2017-05-301-1/+1
| | * | Add clobbered event_idErik Johnston2017-05-302-1/+3
| | * | Add current_state_delta_stream tableErik Johnston2017-05-302-8/+48
| |/ /
| * | Merge pull request #2247 from matrix-org/erikj/auth_eventErik Johnston2017-05-245-13/+118
| |\ \
| | * | Add background task to clear out old event_authErik Johnston2017-05-243-1/+74
| | * | Only store event_auth for state eventsErik Johnston2017-05-243-12/+44
| * | | Merge pull request #2243 from matrix-org/matthew/fix-url-preview-length-againErik Johnston2017-05-231-0/+2
| |\ \ \
| | * | | actually trim oversize og:description metaMatthew Hodgson2017-05-221-0/+2
| * | | | Merge pull request #2237 from matrix-org/erikj/sync_key_countErik Johnston2017-05-234-15/+34
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove redundant invalidationErik Johnston2017-05-231-3/+0
| | * | | Missed an invalidationErik Johnston2017-05-231-0/+3
| | * | | Add missing storage function to slave storeErik Johnston2017-05-221-0/+2
| | * | | Stream count_e2e_one_time_keys cache invalidationErik Johnston2017-05-221-13/+18
| | * | | Add count of one time keys to sync streamErik Johnston2017-05-192-0/+12
| * | | | Merge pull request #2242 from matrix-org/erikj/email_refactorErik Johnston2017-05-235-60/+106
| |\ \ \ \
| | * | | | Only load jinja2 templates onceErik Johnston2017-05-225-60/+106
| |/ / / /
| * | | | Merge pull request #2241 from matrix-org/erikj/fix_notifsErik Johnston2017-05-221-4/+32
| |\ \ \ \
| | * | | | CommentErik Johnston2017-05-221-0/+2
| | * | | | Remove spurious log level guardsErik Johnston2017-05-221-6/+3
| | * | | | Check if current event is a membership eventErik Johnston2017-05-221-4/+9
| | * | | | Add debug loggingErik Johnston2017-05-221-0/+24
| * | | | | Merge pull request #2240 from matrix-org/erikj/cache_list_fixErik Johnston2017-05-221-16/+40
| |\ \ \ \ \
| | * | | | | Pull out if statement from for loopErik Johnston2017-05-221-6/+14
| | * | | | | Update list cache to handle one arg caseErik Johnston2017-05-221-17/+33
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #2238 from matrix-org/erikj/faster_push_rulesErik Johnston2017-05-221-9/+23
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | CommentErik Johnston2017-05-221-1/+4
| | * | | Use tuple unpackingErik Johnston2017-05-221-2/+2
| | * | | Speed up calculating push rulesErik Johnston2017-05-191-8/+19
| |/ / /
| * | | Merge pull request #2236 from matrix-org/erikj/invalidationErik Johnston2017-05-191-1/+3
| |\ \ \
| | * | | Fix invalidation of get_users_with_read_receipts_in_roomErik Johnston2017-05-191-1/+3
| |/ / /
| * | | Merge pull request #2234 from matrix-org/erikj/fix_pushErik Johnston2017-05-195-13/+25
| |\ \ \
| | * | | Move invalidation cb to its own structureErik Johnston2017-05-191-6/+15
| | * | | Store ActionGenerator in HomeServerErik Johnston2017-05-195-7/+10
| |/ / /
| * | | Don't push users who have leftErik Johnston2017-05-181-1/+4
| * | | Increase size of push rule cachesErik Johnston2017-05-181-2/+2
| * | | Merge pull request #2233 from matrix-org/erikj/faster_as_checkErik Johnston2017-05-184-13/+34
| |\ \ \
| | * | | Make get_if_app_services_interested_in_user fasterErik Johnston2017-05-184-13/+34
| |/ / /
| * | | Remove size of push get_rules cacheErik Johnston2017-05-181-1/+1
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-05-183-1/+8
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse v0.21.0Erik Johnston2017-05-18125-2280/+5247
|\ \ \ \
| * | | | Bump changelog and version github/release-v0.21.0 release-v0.21.0Erik Johnston2017-05-182-1/+7
* | | | | Merge pull request #2136 from bbigras/patch-1Erik Johnston2017-04-251-0/+1
|\ \ \ \ \
| * | | | | Fix the system requirements list in README.rstBruno Bigras2017-04-191-0/+1
|/ / / / /
| | * | | Merge pull request #2177 from matrix-org/erikj/faster_push_rulesErik Johnston2017-05-183-47/+252
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add commentErik Johnston2017-05-181-0/+3
| | | * | Faster push rule calculation via push specific cacheErik Johnston2017-05-173-47/+249
| | * | | Merge pull request #2231 from aaronraimist/patch-1Erik Johnston2017-05-181-1/+1
| | |\ \ \
| | | * | | Correct a typo in UPGRADE.rstAaron Raimist2017-05-171-1/+1
| | |/ / /
| | * | | Merge pull request #2230 from matrix-org/erikj/speed_up_get_stateErik Johnston2017-05-173-41/+58
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Make get_state_groups_from_groups faster.Erik Johnston2017-05-173-41/+58
| | * | | Merge pull request #2216 from slipeer/app_services_interested_in_userErik Johnston2017-05-172-3/+6
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix users claimed non-exclusively by an app service don't get notifications #...Slipeer2017-05-112-3/+6
| | * | | Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse into developErik Johnston2017-05-172-1/+26
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Update changelog v0.21.0-rc3Erik Johnston2017-05-171-1/+2
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0Erik Johnston2017-05-171-3/+24
| |\| | |
| | * | | Merge pull request #2229 from matrix-org/erikj/faster_get_joinedErik Johnston2017-05-171-3/+24
| | |\ \ \
| | | * | | CommentErik Johnston2017-05-171-0/+5
| | | * | | Short circuit when we have delta idsErik Johnston2017-05-171-3/+19
| | |/ / /
| * | | | SpellingErik Johnston2017-05-171-2/+2
| * | | | Bump changelog and versionErik Johnston2017-05-172-1/+25
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0Erik Johnston2017-05-1739-147/+668
| |\| | |
| | * | | Merge pull request #2228 from matrix-org/erikj/speed_up_get_hostsErik Johnston2017-05-162-2/+4
| | |\ \ \
| | | * | | Speed up get_joined_hostsErik Johnston2017-05-162-2/+4
| | * | | | Merge pull request #2227 from matrix-org/erikj/presence_cachesErik Johnston2017-05-162-4/+4
| | |\ \ \ \
| | | * | | | Make presence use cached users/hosts in roomErik Johnston2017-05-162-4/+4
| | | |/ / /
| | * | | | Merge pull request #2226 from matrix-org/erikj/domain_from_idErik Johnston2017-05-161-3/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Speed up get_domain_from_idErik Johnston2017-05-161-3/+3
| | |/ / /
| | * | | Merge pull request #2224 from matrix-org/erikj/prefill_stateErik Johnston2017-05-163-9/+26
| | |\ \ \
| | | * | | Remove spurious merge artifactsErik Johnston2017-05-161-13/+0
| | | * | | Take a copy before prefilling, as it may be a frozendictErik Johnston2017-05-161-1/+1
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_stateErik Johnston2017-05-156-1/+38
| | | |\ \ \
| | | * | | | Update commentErik Johnston2017-05-151-1/+2
| | | * | | | CommentsErik Johnston2017-05-152-3/+6
| | | * | | | Add more granular event send metricsErik Johnston2017-05-151-0/+12
| | | * | | | Prefill state cachesErik Johnston2017-05-153-6/+20
| | | | | | * replaced json.dumps with encode_canonical_jsonKrombel2017-06-211-1/+2
| | | | | | * Merge branch 'develop' into avoid_duplicate_filtersKrombel2017-05-1610-13/+101
| | | | | | |\ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge pull request #2218 from matrix-org/rav/event_search_indexRichard van der Hoff2017-05-164-12/+63
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Add a comment to old deltaRichard van der Hoff2017-05-111-0/+4
| | | * | | | Don't create event_search index on sqliteRichard van der Hoff2017-05-112-3/+11
| | | * | | | Add more logging for purgingRichard van der Hoff2017-05-111-7/+14
| | | * | | | Add an index to event_searchRichard van der Hoff2017-05-113-3/+35
| | | |/ / /
| | * | | | Merge pull request #2221 from psaavedra/sync_timeline_limit_filter_by_nameErik Johnston2017-05-154-0/+26
| | |\ \ \ \
| | | * | | | Fixed syntax nitsPablo Saavedra2017-05-152-5/+6
| | | * | | | Fixed implementation errorsPablo Saavedra2017-05-152-3/+7
| | | * | | | Configurable maximum number of events requested by /sync and /messages (#2220)Pablo Saavedra2017-05-134-0/+21
| | | |/ / /
| | * | | | Merge pull request #2223 from matrix-org/erikj/ignore_not_retryingErik Johnston2017-05-151-1/+3
| | |\ \ \ \
| | | * | | | Don't log exceptions for NotRetryingDestinationErik Johnston2017-05-151-1/+3
| | | |/ / /
| | * | | | Merge pull request #2215 from hamber-dick/developErik Johnston2017-05-151-0/+9
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge pull request #1 from hamber-dick/dev-branch-hamber-dickhamber-dick2017-05-101-0/+9
| | | |\ \ \
| | | | * | | Documantation to chek synapse versionhamber-dick2017-05-101-0/+9
| | | |/ / /
| | | | | * avoid access-error if no filter_id matchesKrombel2017-05-151-3/+3
| | | | | * insert whitespace to fix travis buildKrombel2017-05-121-1/+1
| | | | | * add check to only add a new filter if the same filter does not exist previouslyKrombel2017-05-111-0/+9
| | | |_|/ | | |/| |
| | * | | Merge pull request #2214 from matrix-org/rav/hurry_up_purgeRichard van der Hoff2017-05-111-20/+42
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Tidy purge code and add some commentsRichard van der Hoff2017-05-111-12/+19
| | | * | Don't de-delta state groups we're about to deleteRichard van der Hoff2017-05-101-11/+9
| | | * | add some logging to purge_historyRichard van der Hoff2017-05-101-4/+21
| | * | | Merge pull request #2213 from matrix-org/luke/username-availability-qpLuke Barnard2017-05-112-5/+11
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Modify condition on empty localpartLuke Barnard2017-05-101-1/+1
| | | * | Modify register/available to be GET with query paramLuke Barnard2017-05-102-5/+11
| | |/ /
| | * | Merge pull request #2208 from matrix-org/erikj/ratelimit_overridErik Johnston2017-05-106-19/+93
| | |\ \ | | | |/ | | |/|
| | | * Add per user ratelimiting overridesErik Johnston2017-05-106-19/+93
| | * | Merge pull request #2206 from matrix-org/rav/one_time_key_upload_change_sigRichard van der Hoff2017-05-104-36/+239
| | |\ \
| | | * | Replace some instances of preserve_context_over_deferredRichard van der Hoff2017-05-091-3/+3
| | | * | Do some logging when one-time-keys get claimedRichard van der Hoff2017-05-093-0/+54
| | | * | Allow clients to upload one-time-keys with new sigsRichard van der Hoff2017-05-093-33/+182
| | | |/
| | * | Merge pull request #2209 from matrix-org/luke/username-availability-postLuke Barnard2017-05-101-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Change register/available to POST (from GET)Luke Barnard2017-05-101-1/+1
| | |/
| | * Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse into developErik Johnston2017-05-082-1/+63
| | |\ | | |/ | |/|
| * | Bump version and changelog v0.21.0-rc2Erik Johnston2017-05-082-1/+14
| * | Bump version and changelog v0.21.0-rc1Erik Johnston2017-05-082-1/+50
| | * Merge pull request #2203 from matrix-org/erikj/event_cache_hit_ratioErik Johnston2017-05-083-5/+27
| | |\
| | | * Expand docstring a bitErik Johnston2017-05-081-1/+7
| | | * Don't update event cache hit ratio from get_joined_usersErik Johnston2017-05-083-5/+21
| | * | Merge pull request #2201 from matrix-org/erikj/store_device_cacheErik Johnston2017-05-081-3/+22
| | |\ \
| | | * | Add missing yieldsErik Johnston2017-05-081-2/+4
| | | * | Invalidate cache on device deletionErik Johnston2017-05-081-2/+6
| | | * | CommentErik Johnston2017-05-081-0/+2
| | | * | Cache check to see if device existsErik Johnston2017-05-081-1/+12
| | | |/
| | * | Merge pull request #2202 from matrix-org/erikj/cache_count_deviceErik Johnston2017-05-081-0/+9
| | |\ \ | | | |/ | | |/|
| | | * Cache one time key countsErik Johnston2017-05-081-0/+9
| | |/
| | * Increase client_ip cache sizeErik Johnston2017-05-081-0/+1
| | * Merge pull request #2200 from matrix-org/erikj/revert_pushErik Johnston2017-05-084-24/+53
| | |\
| | | * Revert "Remove unused import"Erik Johnston2017-05-081-0/+1
| | | * Revert "We don't care about forgotten rooms"Erik Johnston2017-05-081-0/+12
| | | * Revert "Speed up filtering of a single event in push"Erik Johnston2017-05-084-24/+40
| | |/ | |/|
| | * 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
| | | |/ | | |/|
| * | | Merge pull request #2186 from matrix-org/revert-2175-erikj/prefill_stateErik Johnston2017-05-043-27/+9
| |\ \ \
| | * | | 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-2619-122/+309
| | |\ \ \
| | * | | | 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-217-2/+168
| | |\ \ \ \
| | * | | | | 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-038-6/+35
| | |\ \ \ \ \ \
| | * | | | | | | 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-027-5/+32
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Add more granular event send metricsErik Johnston2017-05-027-5/+32
| | | |/ / / / | | |/| | | |
| * | | | | | 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-273-4/+13
| |\ \ \ \ \
| | * | | | | Queried CONDITIONAL_REQUIREMENTSMatthew Wolff2017-04-181-2/+5
| | * | | | | Fixed travis build failureMatthew Wolff2017-04-171-3/+1
| | * | | | | web_server_root documentation fixMatthew Wolff2017-04-173-4/+12
| * | | | | | 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
| |\ \ \ \ \ \