summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3658 from matrix-org/rav/fix_event_persisted_position_met...Richard van der Hoff2018-08-072-3/+9
|\
| * changelogRichard van der Hoff2018-08-071-0/+1
| * Fix occasional glitches in the synapse_event_persisted_position metricRichard van der Hoff2018-08-071-3/+8
* | fix event lag graphRichard van der Hoff2018-08-071-8/+16
|/
* Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-032-31/+59
* Merge pull request #3644 from matrix-org/michaelkaye/refactor_docker_location...Michael Kaye2018-08-039-112/+139
|\
| * Update README.mdMichael Kaye2018-08-031-1/+1
| * Update README.mdMichael Kaye2018-08-031-1/+1
| * Update README.rstMichael Kaye2018-08-031-1/+1
| * Update README.rstMichael Kaye2018-08-031-3/+10
| * Add news entryMichael Kaye2018-08-021-0/+1
| * Address SPAG issuesMichael Kaye2018-08-021-2/+4
| * Do not include docker files in python buildMichael Kaye2018-08-021-0/+1
| * Refactor docker locations and README.Michael Kaye2018-08-027-110/+126
* | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragmentAmber Brown2018-08-032-1/+2
|\ \ | |/ |/|
| * newsfragmentMichael Kaye2018-08-021-0/+1
| * Mention the word "newsfragment" in CONTRIBUTING.rstMichael Kaye2018-08-021-1/+1
|/
* Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-029-142/+124
|\
| * changelogRichard van der Hoff2018-08-011-0/+1
| * Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-015-78/+47
| * Refactor code for turning HttpResponseException into SynapseErrorRichard van der Hoff2018-08-013-34/+56
| * Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-013-32/+22
* | Merge pull request #3638 from matrix-org/rav/refactor_federation_client_excep...Richard van der Hoff2018-08-022-129/+149
|\ \
| * | changelogRichard van der Hoff2018-08-011-0/+1
| |/
| * Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
* | Merge branch 'master' into developRichard van der Hoff2018-08-0211-21/+77
|\ \
| * \ Merge tag 'v0.33.1'Richard van der Hoff2018-08-029-19/+73
| |\ \
| | * | changelog: this is a security release v0.33.1 github/release-v0.33.1 release-v0.33.1Richard van der Hoff2018-08-021-2/+2
| | * | fix changelog typosRichard van der Hoff2018-08-021-1/+1
| | * | Prepare 0.33.1Richard van der Hoff2018-08-024-3/+11
| | * | Merge pull request #3642 from matrix-org/rav/another_room_id_checkRichard van der Hoff2018-08-025-7/+25
| | |\ \
| | | * | changelogsRichard van der Hoff2018-08-022-1/+2
| | | * | Check room visibility for /event/ requestsRichard van der Hoff2018-08-023-6/+23
| | * | | Merge pull request #3641 from matrix-org/rav/room_id_checkRichard van der Hoff2018-08-025-12/+40
| | |\| |
| | | * | changelogRichard van der Hoff2018-08-021-0/+1
| | | * | Avoid extra db lookupsRichard van der Hoff2018-08-023-62/+26
| | | * | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-023-1/+64
| | |/ /
| * | | Merge pull request #3594 from matrix-org/richvdh-patch-1Richard van der Hoff2018-07-241-2/+3
| |\ \ \
| | * | | Update ISSUE_TEMPLATE.mdRichard van der Hoff2018-07-241-2/+3
| |/ / /
| * | | Merge pull request #3377 from Valodim/note-affinityRichard van der Hoff2018-07-191-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | add note that the affinity package is required for the cpu_affinity settingVincent Breitmoser2018-06-091-0/+2
* | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-023-89/+101
|\ \ \ \
| * | | | update docsErik Johnston2018-08-012-4/+6
| * | | | _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-3037-108/+787
| |\ \ \ \
| * | | | | NewsfileErik Johnston2018-07-271-0/+1
| * | | | | Split out DB writes in federation handlerErik Johnston2018-07-252-85/+94
* | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-0111-16/+275
|\ \ \ \ \ \
| * | | | | | count_monthly_users is now asyncNeil Johnson2018-08-011-1/+2
| * | | | | | improve clarityNeil Johnson2018-08-012-5/+6
| * | | | | | fix isortNeil Johnson2018-08-011-1/+0
| * | | | | | fix test for py3Neil Johnson2018-08-011-0/+4
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-0127-198/+5193
| |\ \ \ \ \ \
| * | | | | | | fix known broken testNeil Johnson2018-08-011-25/+20
| * | | | | | | count_monthly_users() asyncNeil Johnson2018-08-011-4/+7
| * | | | | | | remove need to plot limit_usage_by_mauNeil Johnson2018-08-012-7/+6
| * | | | | | | remove errant printNeil Johnson2018-08-011-1/+0
| * | | | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-014-38/+46
| * | | | | | | only need to loop if mau limiting is enabledNeil Johnson2018-08-011-1/+2
| * | | | | | | mau limtsNeil Johnson2018-07-311-0/+1
| * | | | | | | coding styleNeil Johnson2018-07-317-9/+12
| * | | | | | | fix user_ips countingNeil Johnson2018-07-311-9/+33
| * | | | | | | remove errant loggingNeil Johnson2018-07-301-1/+0
| * | | | | | | actually close connNeil Johnson2018-07-301-4/+8
| * | | | | | | monthly_active_testsNeil Johnson2018-07-301-0/+48
| * | | | | | | factor out metrics from __init__ to app/homeserverNeil Johnson2018-07-302-25/+32
| * | | | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-307-3/+166
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-foundRichard van der Hoff2018-08-013-3/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update 2952.bugfixRichard van der Hoff2018-08-011-1/+1
| * | | | | | return NotFoundError if room not foundSerban Constantin2018-07-313-3/+7
* | | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-0217-67/+122
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3543 from bebehei/dockerJan Christian Grünhage2018-08-014-10/+22
|\ \ \ \ \ \
| * | | | | | [Docker] Use sorted multiline package listsBenedikt Heine2018-07-192-3/+20
| * | | | | | [Docker] Build docker image via composeBenedikt Heine2018-07-172-7/+2
* | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layerRichard van der Hoff2018-08-012-14/+15
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2018-07-311-0/+1
| * | | | | | | rename replication_layer to federation_clientRichard van der Hoff2018-07-311-14/+14
* | | | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decoratorRichard van der Hoff2018-08-013-67/+166
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix invalidationRichard van der Hoff2018-07-272-2/+42
| * | | | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-273-67/+126
* | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failuresTravis Ralston2018-07-317-97/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove pdu_failures from transactionsTravis Ralston2018-07-307-97/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchyRichard van der Hoff2018-07-317-6/+11
|\ \ \ \ \ \ \
| * | | | | | | reinstate explicit include of EventsWorkerStoreRichard van der Hoff2018-07-311-1/+3
| * | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| * | | | | | | Make EventStore inherit from EventFederationStoreRichard van der Hoff2018-07-266-7/+9
* | | | | | | | Merge pull request #3629 from ptman/patch-1Richard van der Hoff2018-07-311-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add some documentation for using the dashboardPaul Tötterman2018-07-311-0/+6
|/ / / / / / / /
* | | | | | | | synapse grafana dashboardRichard van der Hoff2018-07-311-0/+4961
* | | | | | | | Merge pull request #3626 from krombel/only_import_secrets_when_availableAmber Brown2018-07-312-4/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Only import secrets when availableKrombel2018-07-302-4/+4
|/ / / / / / /
* | / / / / / make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-275-7/+43
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pidRichard van der Hoff2018-07-272-0/+5
|\ \ \ \ \ \
| * | | | | | add changelog entry for PR#3391Michael Telatynski2018-07-241-0/+1
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_...Michael Telatynski2018-07-24506-14810/+36527
| |\ \ \ \ \ \
| * | | | | | | if inviter_display_name == ""||None then default to inviter MXIDMichael Telatynski2018-06-131-0/+4
* | | | | | | | Merge pull request #3469 from DJViking/masterRichard van der Hoff2018-07-271-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add instructions for install on OpenSUSE and SLESSverre Moe2018-07-011-0/+13
* | | | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leaveRichard van der Hoff2018-07-262-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Create 3616.miscTravis Ralston2018-07-261-0/+1
| * | | | | | | | | Update the send_leave path to be an event_idTravis Ralston2018-07-261-2/+2
* | | | | | | | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_contentRichard van der Hoff2018-07-264-2/+99
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| * | | | | | | | | | Create the column nullableRichard van der Hoff2018-07-262-9/+13
| * | | | | | | | | | Stop populating events.contentRichard van der Hoff2018-07-262-1/+93
* | | | | | | | | | | Deduplicate redundant lazy-loaded members (#3331)Matthew Hodgson2018-07-263-25/+72
* | | | | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-263-8/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| * | | | | | | | | | Remove some redundant joins on event_edges.room_idRichard van der Hoff2018-07-262-8/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3610 from matrix-org/rav/fix_looping_callsRichard van der Hoff2018-07-2613-15/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-2613-15/+24
| | |_|_|/ / / / / | |/| | | | | | |
* / | | | | | | | comment on event_edgesRichard van der Hoff2018-07-261-1/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-265-62/+532
|\ \ \ \ \ \ \ \
| * | | | | | | | switch missing_types to be a boolMatthew Hodgson2018-07-251-4/+4
| * | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2534-238/+389
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | flake8Matthew Hodgson2018-07-251-12/+12
| * | | | | | | | add tests for _get_some_state_from_cacheMatthew Hodgson2018-07-251-0/+150
| * | | | | | | | incorporate more review.Matthew Hodgson2018-07-251-16/+14
| * | | | | | | | handle the edge case for _get_some_state_from_cache where types is []Matthew Hodgson2018-07-241-1/+7
| * | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-242-12/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | clarify comment on p_idsMatthew Hodgson2018-07-241-1/+2
| * | | | | | | | | consider non-filter_type types as wildcards, thus missing from the state-grou...Matthew Hodgson2018-07-241-1/+4
| * | | | | | | | | rather than adding ll_ids, remove them from p_idsMatthew Hodgson2018-07-241-5/+6
| * | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2417-316/+416
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | incorporate more reviewMatthew Hodgson2018-07-243-30/+27
| * | | | | | | | | | handle case where types is [] on postgres correctlyMatthew Hodgson2018-07-231-1/+1
| * | | | | | | | | | changelogMatthew Hodgson2018-07-231-0/+1
| * | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2353-3241/+3681
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | incorporate reviewMatthew Hodgson2018-07-232-52/+35
| * | | | | | | | | | | make test workMatthew Hodgson2018-07-191-37/+46
| * | | | | | | | | | | first cut of a UT for testing state store (untested)Matthew Hodgson2018-07-191-0/+151
| * | | | | | | | | | | fix thinkos; unbreak testsMatthew Hodgson2018-07-191-2/+2
| * | | | | | | | | | | incorporate reviewMatthew Hodgson2018-07-192-20/+31
| * | | | | | | | | | | add a filtered_types param to limit filtering to specific typesMatthew Hodgson2018-07-192-82/+96
| * | | | | | | | | | | merge develop pydoc for _get_state_for_groupsMatthew Hodgson2018-07-19370-3768/+6264
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-1028-178/+531
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0459-181/+496
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | more commentsMatthew Hodgson2018-06-041-0/+7
| * | | | | | | | | | | | | | add lazy_load_members to the filter json schemaMatthew Hodgson2018-05-291-1/+4
| * | | | | | | | | | | | | | pep8Matthew Hodgson2018-05-291-0/+1
| * | | | | | | | | | | | | | disable CPUMetrics if no /proc/self/statMatthew Hodgson2018-05-291-0/+3
| * | | | | | | | | | | | | | fix dumb typoMatthew Hodgson2018-05-291-4/+4
| * | | | | | | | | | | | | | add pydocMatthew Hodgson2018-05-292-27/+67
| * | | | | | | | | | | | | | merge developMatthew Hodgson2018-05-29242-3342/+7386
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | make lazy_load_members configurable in filtersMatthew Hodgson2018-03-192-9/+15
| * | | | | | | | | | | | | | | 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 stale importMatthew Hodgson2018-03-161-1/+0
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | Replace some ujson with simplejson to make it workErik Johnston2018-03-164-4/+5
| * | | | | | | | | | | | | | | make incr syncs workMatthew Hodgson2018-03-161-3/+4
| * | | | | | | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-03-1410-144/+711
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pep8Matthew Hodgson2018-03-141-2/+2
| * | | | | | | | | | | | | | | | add copyright to nudge CIMatthew Hodgson2018-03-141-1/+2
| * | | | | | | | | | | | | | | | oopsMatthew Hodgson2018-03-131-1/+1
| * | | | | | | | | | | | | | | | make it workMatthew Hodgson2018-03-132-7/+9
| * | | | | | | | | | | | | | | | remove comment now #2969 is fixedMatthew Hodgson2018-03-131-6/+0
| * | | | | | | | | | | | | | | | merge proper fix to bug 2969Matthew Hodgson2018-03-1346-336/+576
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | typoeMatthew Hodgson2018-03-131-1/+1
| | * | | | | | | | | | | | | | | | disable optimisation for searching for state groupsMatthew Hodgson2018-03-131-3/+13
| | * | | | | | | | | | | | | | | | build where_clause sanelyMatthew Hodgson2018-03-131-6/+4
| | * | | | | | | | | | | | | | | | PR feedbackzMatthew Hodgson2018-03-131-3/+2
| | * | | | | | | | | | | | | | | | fix bug #2926Matthew Hodgson2018-03-131-4/+17
| * | | | | | | | | | | | | | | | | ensure we always include the members for a given timeline blockMatthew Hodgson2018-03-131-4/+32
| * | | | | | | | | | | | | | | | | correctly handle None state_keysMatthew Hodgson2018-03-121-10/+16
| * | | | | | | | | | | | | | | | | fix sqlite where clauseMatthew Hodgson2018-03-121-2/+3
| * | | | | | | | | | | | | | | | | typosMatthew Hodgson2018-03-112-2/+4
| * | | | | | | | | | | | | | | | | WIP experiment in lazyloading room membersMatthew Hodgson2018-03-112-17/+73
* | | | | | | | | | | | | | | | | | Merge pull request #3609 from matrix-org/travis/doc-typo-2Travis Ralston2018-07-252-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Create 3609.miscTravis Ralston2018-07-251-0/+1
| * | | | | | | | | | | | | | | | | Fix a minor documentation typo in on_make_leaveTravis Ralston2018-07-251-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #3603 from matrix-org/erikj/handle_outliersErik Johnston2018-07-252-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Actually fix it by adding continueErik Johnston2018-07-251-0/+1
| * | | | | | | | | | | | | | | | | Fix typo in conditionalErik Johnston2018-07-251-1/+1
| * | | | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-251-0/+1
| * | | | | | | | | | | | | | | | | Correctly handle outliers during persist eventsErik Johnston2018-07-251-6/+7
* | | | | | | | | | | | | | | | | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_moreRichard van der Hoff2018-07-253-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix another logcontext leak in _persist_eventsRichard van der Hoff2018-07-253-5/+11
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_errorRichard van der Hoff2018-07-252-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix occasional 'tuple index out of range' errorRichard van der Hoff2018-07-252-1/+2
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cacheRichard van der Hoff2018-07-252-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | changelogRichard van der Hoff2018-07-251-0/+1
| * | | | | | | | | | | | | | | | | | Fix updating of cached remote profilesRichard van der Hoff2018-07-251-1/+8
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #3604 from matrix-org/rav/background_process_fixesRichard van der Hoff2018-07-2512-30/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix unit testsRichard van der Hoff2018-07-252-8/+31
| * | | | | | | | | | | | | | | | | ChangelogRichard van der Hoff2018-07-251-0/+1
| * | | | | | | | | | | | | | | | | Wrap a number of things that run in the backgroundRichard van der Hoff2018-07-259-22/+63
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #3597 from matrix-org/erikj/did_forgetErik Johnston2018-07-245-34/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move newsfileErik Johnston2018-07-241-0/+0
| * | | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-241-0/+1
| * | | | | | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.STARTErik Johnston2018-07-242-5/+9
| * | | | | | | | | | | | | | | | Pull out did_forget to worker storeErik Johnston2018-07-242-29/+28
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3595 from matrix-org/erikj/use_deltasErik Johnston2018-07-242-53/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Expand on docstring comment about return valueErik Johnston2018-07-241-0/+5
| * | | | | | | | | | | | | | | | Remove unnecessary iteritemsErik Johnston2018-07-241-1/+1
| * | | | | | | | | | | | | | | | Fixup comment (and indent)Erik Johnston2018-07-241-16/+20
| * | | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-241-0/+1
| * | | | | | | | | | | | | | | | Don't fetch state from the database unless neededErik Johnston2018-07-241-12/+18
| * | | | | | | | | | | | | | | | Have _get_new_state_after_events return deltaErik Johnston2018-07-241-17/+48
| * | | | | | | | | | | | | | | | Don't require to_delete to have event_idsErik Johnston2018-07-241-36/+55
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #3587 from matrix-org/rav/better_exception_loggingRichard van der Hoff2018-07-242-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | changelogRichard van der Hoff2018-07-231-0/+1
| * | | | | | | | | | | | | | | | Improve logging for exceptions handling PDUsRichard van der Hoff2018-07-231-3/+8
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groupsRichard van der Hoff2018-07-244-62/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_eventsRichard van der Hoff2018-07-232-8/+8
| * | | | | | | | | | | | | | | | newsfileRichard van der Hoff2018-07-231-0/+1
| * | | | | | | | | | | | | | | | Fixes and optimisations for resolve_state_groupsRichard van der Hoff2018-07-231-54/+89
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-244-46/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2419-317/+437
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2330-196/+477
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove redundant checks on room forgottennessRichard van der Hoff2018-07-234-46/+2
* | | | | | | | | | | | | | | | | Merge pull request #3592 from matrix-org/erikj/speed_up_calculate_state_deltaErik Johnston2018-07-242-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c...Erik Johnston2018-07-2417-315/+415
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3591 from matrix-org/rav/logcontext_fixesRichard van der Hoff2018-07-245-21/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-2413-295/+386
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #3555 from matrix-org/erikj/client_apis_moveErik Johnston2018-07-2411-284/+364
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-2419-141/+349
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api...Erik Johnston2018-07-2381-3298/+3718
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update docs/workers.rstErik Johnston2018-07-231-0/+4
| * | | | | | | | | | | | | | | | | | | Move PaginationHandler to its own fileErik Johnston2018-07-203-245/+269
| * | | | | | | | | | | | | | | | | | | Move check_in_room_or_world_readable to AuthErik Johnston2018-07-202-34/+40
| * | | | | | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-181-0/+1
| * | | | | | | | | | | | | | | | | | | Add some room read only APIs to client_readerErik Johnston2018-07-181-1/+13
| * | | | | | | | | | | | | | | | | | | Move RoomContextHandler out of HandlersErik Johnston2018-07-184-6/+12
| * | | | | | | | | | | | | | | | | | | Split MessageHandler into read only and writersErik Johnston2018-07-185-149/+176
* | | | | | | | | | | | | | | | | | | | Merge pull request #3590 from matrix-org/rav/persist_events_metricsRichard van der Hoff2018-07-242-11/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | changelogRichard van der Hoff2018-07-241-0/+1
| * | | | | | | | | | | | | | | | | | | fix idiocyRichard van der Hoff2018-07-241-2/+8
| * | | | | | | | | | | | | | | | | | | Add some measure blocks to persist_eventsRichard van der Hoff2018-07-231-11/+15
|/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | another couple of logcontext leaksRichard van der Hoff2018-07-242-5/+10
| | | * | | | | | | | | | | | | | | | ChangelogRichard van der Hoff2018-07-241-0/+1
| | | * | | | | | | | | | | | | | | | Logcontext fixesRichard van der Hoff2018-07-243-16/+19
| |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Remove unnecessary ifErik Johnston2018-07-241-2/+1
| | | * | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-241-0/+1
| | | * | | | | | | | | | | | | | | Speed up _calculate_state_deltaErik Johnston2018-07-241-10/+3
| |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3584 from matrix-org/erikj/use_cachedErik Johnston2018-07-233-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | CommentsErik Johnston2018-07-232-2/+6
| * | | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| * | | | | | | | | | | | | | | | Only get cached state from context in persist_eventErik Johnston2018-07-232-1/+16
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3582 from matrix-org/erikj/fixup_statelessErik Johnston2018-07-234-8/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| * | | | | | | | | | | | | | | | Fix missing attributes on workers.Erik Johnston2018-07-233-8/+14
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3581 from matrix-org/erikj/fixup_statelessErik Johnston2018-07-232-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| * | | | | | | | | | | | | | | | Fix EventContext when using workersErik Johnston2018-07-231-7/+7
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3579 from matrix-org/erikj/stateless_contexts_4Erik Johnston2018-07-2314-99/+260
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Update docstrings to make senseErik Johnston2018-07-231-5/+8