summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "Use recaptcha_ajax.js directly from Google"Richard van der Hoff2018-08-132-1/+196
* Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-102-196/+1
* 0.33.2Amber Brown2018-08-091-1/+1
* fix for rc1 v0.33.2rc1Amber Brown2018-08-071-1/+1
* versionAmber Brown2018-08-071-1/+1
* Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-031-31/+58
* Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-028-142/+123
|\
| * 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-021-129/+148
|\|
| * Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
* | Merge branch 'master' into developRichard van der Hoff2018-08-029-19/+65
|\ \
| * \ Merge tag 'v0.33.1'Richard van der Hoff2018-08-028-19/+63
| |\ \
| | * | Prepare 0.33.1Richard van der Hoff2018-08-021-1/+1
| | * | Check room visibility for /event/ requestsRichard van der Hoff2018-08-023-6/+23
| | * | 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 #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-022-89/+100
|\ \ \ \
| * | | | 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-3026-108/+446
| |\ \ \ \
| * | | | | 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-017-4/+90
|\ \ \ \ \ \
| * | | | | | count_monthly_users is now asyncNeil Johnson2018-08-011-1/+2
| * | | | | | improve clarityNeil Johnson2018-08-011-4/+5
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-0114-187/+98
| |\ \ \ \ \ \
| * | | | | | | 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-012-17/+18
| * | | | | | | only need to loop if mau limiting is enabledNeil Johnson2018-08-011-1/+2
| * | | | | | | coding styleNeil Johnson2018-07-315-6/+10
| * | | | | | | remove errant loggingNeil Johnson2018-07-301-1/+0
| * | | | | | | actually close connNeil Johnson2018-07-301-4/+8
| * | | | | | | 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-305-2/+69
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-foundRichard van der Hoff2018-08-011-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | return NotFoundError if room not foundSerban Constantin2018-07-311-2/+2
* | | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-0214-48/+96
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layerRichard van der Hoff2018-08-011-14/+14
|\ \ \ \ \ \
| * | | | | | 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-011-67/+64
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix invalidationRichard van der Hoff2018-07-271-1/+1
| * | | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-271-67/+64
* | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failuresTravis Ralston2018-07-315-96/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove pdu_failures from transactionsTravis Ralston2018-07-305-96/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchyRichard van der Hoff2018-07-316-6/+10
|\ \ \ \ \ \
| * | | | | | reinstate explicit include of EventsWorkerStoreRichard van der Hoff2018-07-311-1/+3
| * | | | | | Make EventStore inherit from EventFederationStoreRichard van der Hoff2018-07-266-7/+9
* | | | | | | Only import secrets when availableKrombel2018-07-301-4/+3
| |/ / / / / |/| | | | |
* | | | | | make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-274-7/+42
| |/ / / / |/| | | |
* | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pidRichard van der Hoff2018-07-271-0/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_...Michael Telatynski2018-07-24332-10409/+26535
| |\ \ \ \ \
| * | | | | | if inviter_display_name == ""||None then default to inviter MXIDMichael Telatynski2018-06-131-0/+4
* | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leaveRichard van der Hoff2018-07-261-2/+2
|\ \ \ \ \ \ \
| * | | | | | | 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-263-2/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | 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-262-25/+71
* | | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-262-8/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | 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-2612-15/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-2612-15/+23
| | |_|/ / / / | |/| | | | |
* / | | | | | comment on event_edgesRichard van der Hoff2018-07-261-1/+2
|/ / / / / /
* | | | | | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-263-62/+212
|\ \ \ \ \ \
| * | | | | | switch missing_types to be a boolMatthew Hodgson2018-07-251-4/+4
| * | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2523-231/+349
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | 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-241-12/+4
| |\ \ \ \ \ \
| * | | | | | | 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-2413-316/+409
| |\ \ \ \ \ \ \
| * | | | | | | | incorporate more reviewMatthew Hodgson2018-07-242-30/+18
| * | | | | | | | handle case where types is [] on postgres correctlyMatthew Hodgson2018-07-231-1/+1
| * | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2325-274/+646
| |\ \ \ \ \ \ \ \
| * | | | | | | | | incorporate reviewMatthew Hodgson2018-07-232-52/+35
| * | | | | | | | | 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-19271-2455/+3532
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-1020-124/+176
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0454-166/+398
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | add pydocMatthew Hodgson2018-05-292-27/+67
| * | | | | | | | | | | | merge developMatthew Hodgson2018-05-29186-2989/+5608
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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-1334-301/+515
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | 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-251-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Actually fix it by adding continueErik Johnston2018-07-251-0/+1
| * | | | | | | | | | | | | | | Fix typo in conditionalErik Johnston2018-07-251-1/+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-252-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix another logcontext leak in _persist_eventsRichard van der Hoff2018-07-252-5/+10
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_errorRichard van der Hoff2018-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix occasional 'tuple index out of range' errorRichard van der Hoff2018-07-251-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cacheRichard van der Hoff2018-07-251-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix updating of cached remote profilesRichard van der Hoff2018-07-251-1/+8
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Fix unit testsRichard van der Hoff2018-07-251-1/+1
* | | | | | | | | | | | | | | | Wrap a number of things that run in the backgroundRichard van der Hoff2018-07-259-22/+63
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | 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-241-53/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | 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-241-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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-243-62/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_eventsRichard van der Hoff2018-07-232-8/+8
| * | | | | | | | | | | | | | 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-243-46/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2414-317/+429
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2319-179/+400
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove redundant checks on room forgottennessRichard van der Hoff2018-07-233-46/+1
* | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c...Erik Johnston2018-07-2413-315/+408
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-2410-295/+380
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3555 from matrix-org/erikj/client_apis_moveErik Johnston2018-07-249-284/+359
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-2412-126/+305
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api...Erik Johnston2018-07-2333-223/+683
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | Logcontext fixesRichard van der Hoff2018-07-243-16/+19
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Remove unnecessary ifErik Johnston2018-07-241-2/+1
* | | | | | | | | | | | | | | | Speed up _calculate_state_deltaErik Johnston2018-07-241-10/+3
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | CommentsErik Johnston2018-07-232-2/+6
* | | | | | | | | | | | | | | Only get cached state from context in persist_eventErik Johnston2018-07-232-1/+16
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fix missing attributes on workers.Erik Johnston2018-07-233-8/+14
* | | | | | | | | | | | | | Fix EventContext when using workersErik Johnston2018-07-231-7/+7
* | | | | | | | | | | | | | Update docstrings to make senseErik Johnston2018-07-231-5/+8
* | | | | | | | | | | | | | Add support for updating stateErik Johnston2018-07-232-9/+42
* | | | | | | | | | | | | | Use new gettersErik Johnston2018-07-239-31/+59
* | | | | | | | | | | | | | Make EventContext lazy load stateErik Johnston2018-07-232-44/+115
* | | | | | | | | | | | | | pep8Erik Johnston2018-07-231-1/+1
* | | | | | | | | | | | | | Refcator EventContext to accept state during initErik Johnston2018-07-232-63/+82
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'develop' into matthew/sync_deleted_devicesMatthew Hodgson2018-07-2356-672/+1056
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-216-25/+32
| * | | | | | | | | | | | | Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-201-6/+22
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixesRichard van der Hoff2018-07-202-94/+39
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Combine Limiter and LinearizerRichard van der Hoff2018-07-202-91/+12
| | * | | | | | | | | | | | Improvements to the LimiterRichard van der Hoff2018-07-202-14/+21
| | * | | | | | | | | | | | Add a sleep to the Limiter to fix stack overflows.Richard van der Hoff2018-07-201-3/+20
| * | | | | | | | | | | | | Admin API for creating new users (#3415)Amber Brown2018-07-203-0/+169
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-07-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | 0.33 finalAmber Brown2018-07-191-1/+1
| * | | | | | | | | | | | Don't spew errors because we can't save metrics (#3563)Amber Brown2018-07-192-6/+24
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | revert 00bc979Richard van der Hoff2018-07-191-4/+3
| * | | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.0' into developRichard van der Hoff2018-07-192-4/+5
| |\| | | | | | | | | |
| | * | | | | | | | | | Disable logcontext warningRichard van der Hoff2018-07-191-3/+4
| | * | | | | | | | | | bump to 0.33.0rc1Amber Brown2018-07-181-1/+1
| * | | | | | | | | | | Merge pull request #3556 from matrix-org/rav/background_processesRichard van der Hoff2018-07-197-52/+62
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Make Distributor run its processes as a background processRichard van der Hoff2018-07-181-26/+18
| | * | | | | | | | | | | Run things as background processesRichard van der Hoff2018-07-187-26/+44
| * | | | | | | | | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460)Amber Brown2018-07-196-15/+88
| * | | | | | | | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_codeErik Johnston2018-07-191-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | pep8Erik Johnston2018-07-181-1/+2
| | * | | | | | | | | | | Add response code to response timer metricsErik Johnston2018-07-181-3/+5
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #3553 from matrix-org/rav/background_process_trackingRichard van der Hoff2018-07-182-5/+186
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Resource tracking for background processesRichard van der Hoff2018-07-182-5/+186
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacksRichard van der Hoff2018-07-181-43/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/drop_re_signing_hacksRichard van der Hoff2018-07-04101-571/+1178
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove event re-signing hacksRichard van der Hoff2018-06-071-43/+0
| * | | | | | | | | | | | Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaultsDavid Baker2018-07-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Comment dummy TURN parameters in default configDavid Baker2018-07-111-2/+2
| * | | | | | | | | | | | add a commentRichard van der Hoff2018-07-171-0/+2
| * | | | | | | | | | | | Fix visibility of events from erased users over federationRichard van der Hoff2018-07-171-56/+67
| * | | | | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-172-138/+147
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fix importsRichard van der Hoff2018-07-171-0/+1
| | * | | | | | | | | | | | add a commentRichard van der Hoff2018-07-171-0/+2
| | * | | | | | | | | | | | Attempt to make _filter_events_for_server more efficientRichard van der Hoff2018-07-161-17/+23
| | * | | | | | | | | | | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-162-138/+138
| * | | | | | | | | | | | | Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-172-3/+4
| * | | | | | | | | | | | | Use efficient .intersectionErik Johnston2018-07-171-4/+1
| * | | | | | | | | | | | | Fix perf regression in PR #3530Erik Johnston2018-07-171-1/+6
| * | | | | | | | | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cacheAmber Brown2018-07-171-8/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Don't return unknown entities in get_entities_changedErik Johnston2018-07-131-8/+1
| * | | | | | | | | | | | | | rerun isort with latest versionKrombel2018-07-166-20/+4
| * | | | | | | | | | | | | | check isort by travisKrombel2018-07-1611-11/+27
| * | | | | | | | | | | | | | Fix develop because I broke it :( (#3535)Amber Brown2018-07-142-2/+5
| * | | | | | | | | | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servletAmber Brown2018-07-1417-165/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | fix sytestsAmber Brown2018-07-141-1/+1
| | * | | | | | | | | | | | | | add changelogKrombel2018-07-131-1/+1
| | * | | | | | | | | | | | | | rename assert_params_in_request to assert_params_in_dictKrombel2018-07-1311-33/+33
| | * | | | | | | | | | | | | | Use parse_{int,str} and assert from http.servletKrombel2018-07-1314-155/+91
| * | | | | | | | | | | | | | | Make auth & transactions more testable (#3499)Amber Brown2018-07-148-97/+93
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queueRichard van der Hoff2018-07-131-10/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Make FederationRateLimiter queue requests properlyRichard van der Hoff2018-07-131-10/+23
| | |/ / / / / / / / / / / /
| * / / / / / / / / / / / / typoMatthew Hodgson2018-07-131-3/+3
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cacheRichard van der Hoff2018-07-121-8/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Reduce set building in get_entities_changedRichard van der Hoff2018-07-121-8/+12
| * | | | | | | | | | | | | Merge branch 'develop' into rav/enforce_report_apiRichard van der Hoff2018-07-12270-2247/+3387
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #3505 from matrix-org/erikj/receipts_cahceErik Johnston2018-07-122-7/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Update return value docstringErik Johnston2018-07-121-1/+1
| | | * | | | | | | | | | | Use 'is not None' and add commentsErik Johnston2018-07-101-2/+6
| | | * | | | | | | | | | | Use stream cache in get_linearized_receipts_for_roomErik Johnston2018-07-102-5/+14
| * | | | | | | | | | | | | Enforce the specified API for report_eventRichard van der Hoff2018-05-311-2/+23
* | | | | | | | | | | | | | add trailing commaMatthew Hodgson2018-07-231-1/+1
* | | | | | | | | | | | | | yes, we do need to invalidate the device_id_exists_cache when deleting a remo...Matthew Hodgson2018-07-191-1/+0
* | | | | | | | | | | | | | spell out that include_deleted_devices requires include_all_devicesMatthew Hodgson2018-07-191-1/+5
* | | | | | | | | | | | | | shift to using an explicit deleted flag on m.device_list_update EDUsMatthew Hodgson2018-07-122-20/+25
* | | | | | | | | | | | | | WIP to announce deleted devices over federationMatthew Hodgson2018-07-123-14/+44
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | s/becuase/because/gMatthew Hodgson2018-07-103-4/+4
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Attempt to include db threads in cpu usage stats (#3496)Richard van der Hoff2018-07-103-20/+38
* | | | | | | | | | | | Refactor logcontext resource usage tracking (#3501)Richard van der Hoff2018-07-104-130/+146
* | | | | | | | | | | | another typoMatthew Hodgson2018-07-101-1/+1
* | | | | | | | | | | | typo (i think)Matthew Hodgson2018-07-101-1/+1
* | | | | | | | | | | | Add CPU metrics for _fetch_event_listRichard van der Hoff2018-07-091-19/+32
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-27 16:18:07 +0000