summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | | | | Merge branch 'develop' into erikj/stateless_contexts_4Richard van der Hoff2018-07-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3577 from matrix-org/erikj/cleanup_contextErik Johnston2018-07-233-63/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| | * | | | | | | | | | | Fix unit testsErik Johnston2018-07-232-15/+40
| | * | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+1
| | * | | | | | | | | | | 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
| * | | | | | | | | | | NewsfileErik Johnston2018-07-231-0/+0
| * | | | | | | | | | | Refcator EventContext to accept state during initErik Johnston2018-07-232-63/+82
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devicesMatthew Hodgson2018-07-234-22/+61
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/sync_deleted_devicesMatthew Hodgson2018-07-23103-4671/+5379
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Make the rest of the .iterwhatever go away (#3562)Amber Brown2018-07-218-27/+33
* | | | | | | | | | | | Merge pull request #3572 from matrix-org/rav/linearizer_cancellationRichard van der Hoff2018-07-203-6/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ChangelogRichard van der Hoff2018-07-201-0/+1
| * | | | | | | | | | | Test and fix support for cancellation in LinearizerRichard van der Hoff2018-07-202-6/+53
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixesRichard van der Hoff2018-07-206-164/+88
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | changelogsRichard van der Hoff2018-07-202-0/+2
| * | | | | | | | | | | Combine Limiter and LinearizerRichard van der Hoff2018-07-204-161/+59
| * | | | | | | | | | | 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-202-7/+24
* | | | | | | | | | | | Admin API for creating new users (#3415)Amber Brown2018-07-208-3/+569
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3564 from matrix-org/hawkowl/markdownRichard van der Hoff2018-07-195-2879/+2499
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into hawkowl/markdownAmber Brown2018-07-191-7/+16
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-07-191-7/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update r0.33.0 release notes github/release-v0.33.0 release-v0.33.0Richard van der Hoff2018-07-191-7/+17
| | * | | | | | | | | | | fixesAmber Brown2018-07-192-1/+2
| | * | | | | | | | | | | fix up weird translation thingsAmber Brown2018-07-191-806/+813
| | * | | | | | | | | | | changelogAmber Brown2018-07-191-0/+1
| | * | | | | | | | | | | make pyproject point at itAmber Brown2018-07-191-2/+27
| | * | | | | | | | | | | rst -> mdAmber Brown2018-07-192-2867/+2454
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-07-193-8/+8
|\| | | | | | | | | | |
| * | | | | | | | | | | 0.33.0 final changelog v0.33.0Amber Brown2018-07-1921-13/+28
| * | | | | | | | | | | 0.33 finalAmber Brown2018-07-191-1/+1
| * | | | | | | | | | | update changelogsAmber Brown2018-07-196-2/+4
| * | | | | | | | | | | Revert "0.33.0rc1 changelog"Amber Brown2018-07-1920-27/+10
* | | | | | | | | | | | Don't spew errors because we can't save metrics (#3563)Amber Brown2018-07-193-6/+25
* | | | | | | | | | | | Merge pull request #3507 from Peetz0r/patch-1Richard van der Hoff2018-07-191-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | change http links to httpsPeter2018-07-101-8/+8
* | | | | | | | | | | | revert 00bc979Richard van der Hoff2018-07-191-4/+3
* | | | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.0' into developRichard van der Hoff2018-07-1923-14/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3561 from matrix-org/rav/disable_logcontext_warningRichard van der Hoff2018-07-192-3/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | changelogRichard van der Hoff2018-07-191-0/+1
| | * | | | | | | | | | | Disable logcontext warningRichard van der Hoff2018-07-191-3/+4
| |/ / / / / / / / / / /
| * | | | | | | | | | | 0.33.0rc1 changelog v0.33.0rc1Amber Brown2018-07-1820-10/+27
| * | | | | | | | | | | bump to 0.33.0rc1Amber Brown2018-07-181-1/+1
* | | | | | | | | | | | Merge pull request #3556 from matrix-org/rav/background_processesRichard van der Hoff2018-07-199-104/+67
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make Distributor run its processes as a background processRichard van der Hoff2018-07-182-78/+22
| * | | | | | | | | | | | changelogRichard van der Hoff2018-07-181-0/+1
| * | | | | | | | | | | | 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-1913-101/+116
* | | | | | | | | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_codeErik Johnston2018-07-192-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pep8Erik Johnston2018-07-181-1/+2
| * | | | | | | | | | | | | NewsfileErik Johnston2018-07-181-0/+1
| * | | | | | | | | | | | | Add response code to response timer metricsErik Johnston2018-07-181-3/+5
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3559 from matrix-org/rav/pep8_configAmber Brown2018-07-192-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | changelogRichard van der Hoff2018-07-181-0/+1
| * | | | | | | | | | | | add config for pep8Richard van der Hoff2018-07-181-3/+8
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #3553 from matrix-org/rav/background_process_trackingRichard van der Hoff2018-07-183-5/+187
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | changelogRichard van der Hoff2018-07-181-0/+1
| * | | | | | | | | | | 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-182-43/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add changelogRichard van der Hoff2018-07-041-0/+1
| * | | | | | | | | | | Merge branch 'develop' into rav/drop_re_signing_hacksRichard van der Hoff2018-07-04152-642/+2188
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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-182-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | I failed to correctly guess the PR numberDavid Baker2018-07-111-0/+0
| * | | | | | | | | | | | Comment dummy TURN parameters in default configDavid Baker2018-07-112-2/+3
* | | | | | | | | | | | | Merge pull request #3546 from matrix-org/rav/fix_erasure_over_federationRichard van der Hoff2018-07-173-56/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add a commentRichard van der Hoff2018-07-171-0/+2
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-07-171-0/+1
| * | | | | | | | | | | | | Fix visibility of events from erased users over federationRichard van der Hoff2018-07-172-56/+130
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_serverRichard van der Hoff2018-07-174-138/+409
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix importsRichard van der Hoff2018-07-172-0/+2
| * | | | | | | | | | | | | add a commentRichard van der Hoff2018-07-171-0/+2
| * | | | | | | | | | | | | ChangelogRichard van der Hoff2018-07-161-0/+1
| * | | | | | | | | | | | | Attempt to make _filter_events_for_server more efficientRichard van der Hoff2018-07-161-17/+23
| * | | | | | | | | | | | | Add a test which profiles filter_events_for_server in a large roomRichard van der Hoff2018-07-161-2/+155
| * | | | | | | | | | | | | Move filter_events_for_server out of FederationHandlerRichard van der Hoff2018-07-163-138/+245
* | | | | | | | | | | | | | Refactor REST API tests to use explicit reactors (#3351)Amber Brown2018-07-1713-934/+939
* | | | | | | | | | | | | | Merge pull request #3544 from matrix-org/erikj/fixup_stream_cacheErik Johnston2018-07-173-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use efficient .intersectionErik Johnston2018-07-171-4/+1
| * | | | | | | | | | | | | | Add unit testErik Johnston2018-07-171-0/+16
| * | | | | | | | | | | | | | NewsfileErik Johnston2018-07-171-0/+0
| * | | | | | | | | | | | | | Fix perf regression in PR #3530Erik Johnston2018-07-171-1/+6
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cacheAmber Brown2018-07-173-11/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixup unit testErik Johnston2018-07-131-3/+3
| * | | | | | | | | | | | | | NewsfileErik Johnston2018-07-131-0/+0
| * | | | | | | | | | | | | | Don't return unknown entities in get_entities_changedErik Johnston2018-07-131-8/+1
* | | | | | | | | | | | | | | Merge pull request #3540 from krombel/enforce_isortAmber Brown2018-07-178-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rename 'isort' to 'check_isort' as requestedKrombel2018-07-162-3/+3
| * | | | | | | | | | | | | | | rerun isort with latest versionKrombel2018-07-166-20/+4
| * | | | | | | | | | | | | | | check isort by travisKrombel2018-07-1614-13/+37
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Fix develop because I broke it :( (#3535)Amber Brown2018-07-143-2/+5
* | | | | | | | | | | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servletAmber Brown2018-07-1418-165/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fix sytestsAmber Brown2018-07-141-1/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-25 22:11:45 +0000