Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove some redundant joins on event_edges.room_id | Richard van der Hoff | 2018-07-26 | 2 | -8/+6 |
* | comment on event_edges | Richard van der Hoff | 2018-07-26 | 1 | -1/+2 |
* | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 5 | -62/+532 |
|\ | |||||
| * | switch missing_types to be a bool | Matthew Hodgson | 2018-07-25 | 1 | -4/+4 |
| * | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 34 | -238/+389 |
| |\ | |||||
| * | | flake8 | Matthew Hodgson | 2018-07-25 | 1 | -12/+12 |
| * | | add tests for _get_some_state_from_cache | Matthew Hodgson | 2018-07-25 | 1 | -0/+150 |
| * | | incorporate more review. | Matthew Hodgson | 2018-07-25 | 1 | -16/+14 |
| * | | handle the edge case for _get_some_state_from_cache where types is [] | Matthew Hodgson | 2018-07-24 | 1 | -1/+7 |
| * | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 2 | -12/+5 |
| |\ \ | |||||
| * | | | clarify comment on p_ids | Matthew Hodgson | 2018-07-24 | 1 | -1/+2 |
| * | | | consider non-filter_type types as wildcards, thus missing from the state-grou... | Matthew Hodgson | 2018-07-24 | 1 | -1/+4 |
| * | | | rather than adding ll_ids, remove them from p_ids | Matthew Hodgson | 2018-07-24 | 1 | -5/+6 |
| * | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 17 | -316/+416 |
| |\ \ \ | |||||
| * | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 3 | -30/+27 |
| * | | | | handle case where types is [] on postgres correctly | Matthew Hodgson | 2018-07-23 | 1 | -1/+1 |
| * | | | | changelog | Matthew Hodgson | 2018-07-23 | 1 | -0/+1 |
| * | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 53 | -3241/+3681 |
| |\ \ \ \ | |||||
| * | | | | | incorporate review | Matthew Hodgson | 2018-07-23 | 2 | -52/+35 |
| * | | | | | make test work | Matthew Hodgson | 2018-07-19 | 1 | -37/+46 |
| * | | | | | first cut of a UT for testing state store (untested) | Matthew Hodgson | 2018-07-19 | 1 | -0/+151 |
| * | | | | | fix thinkos; unbreak tests | Matthew Hodgson | 2018-07-19 | 1 | -2/+2 |
| * | | | | | incorporate review | Matthew Hodgson | 2018-07-19 | 2 | -20/+31 |
| * | | | | | add a filtered_types param to limit filtering to specific types | Matthew Hodgson | 2018-07-19 | 2 | -82/+96 |
| * | | | | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 370 | -3768/+6264 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 28 | -178/+531 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 59 | -181/+496 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | more comments | Matthew Hodgson | 2018-06-04 | 1 | -0/+7 |
| * | | | | | | | | add lazy_load_members to the filter json schema | Matthew Hodgson | 2018-05-29 | 1 | -1/+4 |
| * | | | | | | | | pep8 | Matthew Hodgson | 2018-05-29 | 1 | -0/+1 |
| * | | | | | | | | disable CPUMetrics if no /proc/self/stat | Matthew Hodgson | 2018-05-29 | 1 | -0/+3 |
| * | | | | | | | | fix dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -4/+4 |
| * | | | | | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 2 | -27/+67 |
| * | | | | | | | | merge develop | Matthew Hodgson | 2018-05-29 | 242 | -3342/+7386 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 2 | -9/+15 |
| * | | | | | | | | | reshuffle todo & comments | Matthew Hodgson | 2018-03-19 | 1 | -2/+10 |
| * | | | | | | | | | only get member state IDs for incremental syncs if we're filtering | Matthew Hodgson | 2018-03-18 | 1 | -5/+5 |
| * | | | | | | | | | remove stale import | Matthew Hodgson | 2018-03-16 | 1 | -1/+0 |
| * | | | | | | | | | remove debug | Matthew Hodgson | 2018-03-16 | 1 | -4/+0 |
| * | | | | | | | | | fix tsm search again | Matthew Hodgson | 2018-03-16 | 1 | -5/+4 |
| * | | | | | | | | | add state_ids for timeline entries | Matthew Hodgson | 2018-03-16 | 1 | -4/+14 |
| * | | | | | | | | | simplify timeline_start_members | Matthew Hodgson | 2018-03-16 | 1 | -14/+13 |
| * | | | | | | | | | Replace some ujson with simplejson to make it work | Erik Johnston | 2018-03-16 | 4 | -4/+5 |
| * | | | | | | | | | make incr syncs work | Matthew Hodgson | 2018-03-16 | 1 | -3/+4 |
| * | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-03-14 | 10 | -144/+711 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pep8 | Matthew Hodgson | 2018-03-14 | 1 | -2/+2 |
| * | | | | | | | | | | add copyright to nudge CI | Matthew Hodgson | 2018-03-14 | 1 | -1/+2 |
| * | | | | | | | | | | oops | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
| * | | | | | | | | | | make it work | Matthew Hodgson | 2018-03-13 | 2 | -7/+9 |
| * | | | | | | | | | | remove comment now #2969 is fixed | Matthew Hodgson | 2018-03-13 | 1 | -6/+0 |
| * | | | | | | | | | | merge proper fix to bug 2969 | Matthew Hodgson | 2018-03-13 | 46 | -336/+576 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | typoe | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
| | * | | | | | | | | | | disable optimisation for searching for state groups | Matthew Hodgson | 2018-03-13 | 1 | -3/+13 |
| | * | | | | | | | | | | build where_clause sanely | Matthew Hodgson | 2018-03-13 | 1 | -6/+4 |
| | * | | | | | | | | | | PR feedbackz | Matthew Hodgson | 2018-03-13 | 1 | -3/+2 |
| | * | | | | | | | | | | fix bug #2926 | Matthew Hodgson | 2018-03-13 | 1 | -4/+17 |
| * | | | | | | | | | | | ensure we always include the members for a given timeline block | Matthew Hodgson | 2018-03-13 | 1 | -4/+32 |
| * | | | | | | | | | | | correctly handle None state_keys | Matthew Hodgson | 2018-03-12 | 1 | -10/+16 |
| * | | | | | | | | | | | fix sqlite where clause | Matthew Hodgson | 2018-03-12 | 1 | -2/+3 |
| * | | | | | | | | | | | typos | Matthew Hodgson | 2018-03-11 | 2 | -2/+4 |
| * | | | | | | | | | | | WIP experiment in lazyloading room members | Matthew Hodgson | 2018-03-11 | 2 | -17/+73 |
* | | | | | | | | | | | | Merge pull request #3609 from matrix-org/travis/doc-typo-2 | Travis Ralston | 2018-07-25 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Create 3609.misc | Travis Ralston | 2018-07-25 | 1 | -0/+1 |
| * | | | | | | | | | | | Fix a minor documentation typo in on_make_leave | Travis Ralston | 2018-07-25 | 1 | -1/+1 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3603 from matrix-org/erikj/handle_outliers | Erik Johnston | 2018-07-25 | 2 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Actually fix it by adding continue | Erik Johnston | 2018-07-25 | 1 | -0/+1 |
| * | | | | | | | | | | | Fix typo in conditional | Erik Johnston | 2018-07-25 | 1 | -1/+1 |
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-25 | 1 | -0/+1 |
| * | | | | | | | | | | | Correctly handle outliers during persist events | Erik Johnston | 2018-07-25 | 1 | -6/+7 |
* | | | | | | | | | | | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_more | Richard van der Hoff | 2018-07-25 | 3 | -5/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix another logcontext leak in _persist_events | Richard van der Hoff | 2018-07-25 | 3 | -5/+11 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_error | Richard van der Hoff | 2018-07-25 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix occasional 'tuple index out of range' error | Richard van der Hoff | 2018-07-25 | 2 | -1/+2 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cache | Richard van der Hoff | 2018-07-25 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| * | | | | | | | | | | | | Fix updating of cached remote profiles | Richard van der Hoff | 2018-07-25 | 1 | -1/+8 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3604 from matrix-org/rav/background_process_fixes | Richard van der Hoff | 2018-07-25 | 12 | -30/+95 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix unit tests | Richard van der Hoff | 2018-07-25 | 2 | -8/+31 |
| * | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-25 | 1 | -0/+1 |
| * | | | | | | | | | | | Wrap a number of things that run in the background | Richard van der Hoff | 2018-07-25 | 9 | -22/+63 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3597 from matrix-org/erikj/did_forget | Erik Johnston | 2018-07-24 | 5 | -34/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Move newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+0 |
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| * | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.START | Erik Johnston | 2018-07-24 | 2 | -5/+9 |
| * | | | | | | | | | | | Pull out did_forget to worker store | Erik Johnston | 2018-07-24 | 2 | -29/+28 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3595 from matrix-org/erikj/use_deltas | Erik Johnston | 2018-07-24 | 2 | -53/+119 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Expand on docstring comment about return value | Erik Johnston | 2018-07-24 | 1 | -0/+5 |
| * | | | | | | | | | | | Remove unnecessary iteritems | Erik Johnston | 2018-07-24 | 1 | -1/+1 |
| * | | | | | | | | | | | Fixup comment (and indent) | Erik Johnston | 2018-07-24 | 1 | -16/+20 |
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| * | | | | | | | | | | | Don't fetch state from the database unless needed | Erik Johnston | 2018-07-24 | 1 | -12/+18 |
| * | | | | | | | | | | | Have _get_new_state_after_events return delta | Erik Johnston | 2018-07-24 | 1 | -17/+48 |
| * | | | | | | | | | | | Don't require to_delete to have event_ids | Erik Johnston | 2018-07-24 | 1 | -36/+55 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3587 from matrix-org/rav/better_exception_logging | Richard van der Hoff | 2018-07-24 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-23 | 1 | -0/+1 |
| * | | | | | | | | | | | Improve logging for exceptions handling PDUs | Richard van der Hoff | 2018-07-23 | 1 | -3/+8 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groups | Richard van der Hoff | 2018-07-24 | 4 | -62/+98 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_events | Richard van der Hoff | 2018-07-23 | 2 | -8/+8 |
| * | | | | | | | | | | | newsfile | Richard van der Hoff | 2018-07-23 | 1 | -0/+1 |
| * | | | | | | | | | | | Fixes and optimisations for resolve_state_groups | Richard van der Hoff | 2018-07-23 | 1 | -54/+89 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 4 | -46/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 19 | -317/+437 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-23 | 30 | -196/+477 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove redundant checks on room forgottenness | Richard van der Hoff | 2018-07-23 | 4 | -46/+2 |
* | | | | | | | | | | | | Merge pull request #3592 from matrix-org/erikj/speed_up_calculate_state_delta | Erik Johnston | 2018-07-24 | 2 | -12/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c... | Erik Johnston | 2018-07-24 | 17 | -315/+415 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3591 from matrix-org/rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 5 | -21/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 13 | -295/+386 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #3555 from matrix-org/erikj/client_apis_move | Erik Johnston | 2018-07-24 | 11 | -284/+364 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 19 | -141/+349 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api... | Erik Johnston | 2018-07-23 | 81 | -3298/+3718 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Update docs/workers.rst | Erik Johnston | 2018-07-23 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | Move PaginationHandler to its own file | Erik Johnston | 2018-07-20 | 3 | -245/+269 |
| * | | | | | | | | | | | | | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 2 | -34/+40 |
| * | | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Add some room read only APIs to client_reader | Erik Johnston | 2018-07-18 | 1 | -1/+13 |
| * | | | | | | | | | | | | | | Move RoomContextHandler out of Handlers | Erik Johnston | 2018-07-18 | 4 | -6/+12 |
| * | | | | | | | | | | | | | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 5 | -149/+176 |
* | | | | | | | | | | | | | | | Merge pull request #3590 from matrix-org/rav/persist_events_metrics | Richard van der Hoff | 2018-07-24 | 2 | -11/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | fix idiocy | Richard van der Hoff | 2018-07-24 | 1 | -2/+8 |
| * | | | | | | | | | | | | | | Add some measure blocks to persist_events | Richard van der Hoff | 2018-07-23 | 1 | -11/+15 |
|/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | another couple of logcontext leaks | Richard van der Hoff | 2018-07-24 | 2 | -5/+10 |
| | | * | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-24 | 1 | -0/+1 |
| | | * | | | | | | | | | | | Logcontext fixes | Richard van der Hoff | 2018-07-24 | 3 | -16/+19 |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Remove unnecessary if | Erik Johnston | 2018-07-24 | 1 | -2/+1 |
| | | * | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-24 | 1 | -0/+1 |
| | | * | | | | | | | | | | Speed up _calculate_state_delta | Erik Johnston | 2018-07-24 | 1 | -10/+3 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3584 from matrix-org/erikj/use_cached | Erik Johnston | 2018-07-23 | 3 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Comments | Erik Johnston | 2018-07-23 | 2 | -2/+6 |
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| * | | | | | | | | | | | Only get cached state from context in persist_event | Erik Johnston | 2018-07-23 | 2 | -1/+16 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3582 from matrix-org/erikj/fixup_stateless | Erik Johnston | 2018-07-23 | 4 | -8/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| * | | | | | | | | | | | Fix missing attributes on workers. | Erik Johnston | 2018-07-23 | 3 | -8/+14 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3581 from matrix-org/erikj/fixup_stateless | Erik Johnston | 2018-07-23 | 2 | -7/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| * | | | | | | | | | | | Fix EventContext when using workers | Erik Johnston | 2018-07-23 | 1 | -7/+7 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3579 from matrix-org/erikj/stateless_contexts_4 | Erik Johnston | 2018-07-23 | 14 | -99/+260 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update docstrings to make sense | Erik Johnston | 2018-07-23 | 1 | -5/+8 |
| * | | | | | | | | | | | Merge branch 'develop' into erikj/stateless_contexts_4 | Richard van der Hoff | 2018-07-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3577 from matrix-org/erikj/cleanup_context | Erik Johnston | 2018-07-23 | 3 | -63/+82 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix unit tests | Erik Johnston | 2018-07-23 | 2 | -15/+40 |
| | * | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+1 |
| | * | | | | | | | | | | Add support for updating state | Erik Johnston | 2018-07-23 | 2 | -9/+42 |
| | * | | | | | | | | | | Use new getters | Erik Johnston | 2018-07-23 | 9 | -31/+59 |
| | * | | | | | | | | | | Make EventContext lazy load state | Erik Johnston | 2018-07-23 | 2 | -44/+115 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | pep8 | Erik Johnston | 2018-07-23 | 1 | -1/+1 |
| * | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-23 | 1 | -0/+0 |
| * | | | | | | | | | | Refcator EventContext to accept state during init | Erik Johnston | 2018-07-23 | 2 | -63/+82 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 4 | -22/+61 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 103 | -4671/+5379 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 8 | -27/+33 |
* | | | | | | | | | | | Merge pull request #3572 from matrix-org/rav/linearizer_cancellation | Richard van der Hoff | 2018-07-20 | 3 | -6/+54 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-20 | 1 | -0/+1 |
| * | | | | | | | | | | Test and fix support for cancellation in Linearizer | Richard van der Hoff | 2018-07-20 | 2 | -6/+53 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixes | Richard van der Hoff | 2018-07-20 | 6 | -164/+88 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | changelogs | Richard van der Hoff | 2018-07-20 | 2 | -0/+2 |
| * | | | | | | | | | | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 4 | -161/+59 |
| * | | | | | | | | | | Improvements to the Limiter | Richard van der Hoff | 2018-07-20 | 2 | -14/+21 |
| * | | | | | | | | | | Add a sleep to the Limiter to fix stack overflows. | Richard van der Hoff | 2018-07-20 | 2 | -7/+24 |
* | | | | | | | | | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 8 | -3/+569 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3564 from matrix-org/hawkowl/markdown | Richard van der Hoff | 2018-07-19 | 5 | -2879/+2499 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into hawkowl/markdown | Amber Brown | 2018-07-19 | 1 | -7/+16 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-07-19 | 1 | -7/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update r0.33.0 release notes github/release-v0.33.0 release-v0.33.0 | Richard van der Hoff | 2018-07-19 | 1 | -7/+17 |
| | * | | | | | | | | | | fixes | Amber Brown | 2018-07-19 | 2 | -1/+2 |
| | * | | | | | | | | | | fix up weird translation things | Amber Brown | 2018-07-19 | 1 | -806/+813 |
| | * | | | | | | | | | | changelog | Amber Brown | 2018-07-19 | 1 | -0/+1 |
| | * | | | | | | | | | | make pyproject point at it | Amber Brown | 2018-07-19 | 1 | -2/+27 |
| | * | | | | | | | | | | rst -> md | Amber Brown | 2018-07-19 | 2 | -2867/+2454 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-07-19 | 3 | -8/+8 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | 0.33.0 final changelog v0.33.0 | Amber Brown | 2018-07-19 | 21 | -13/+28 |
| * | | | | | | | | | | 0.33 final | Amber Brown | 2018-07-19 | 1 | -1/+1 |
| * | | | | | | | | | | update changelogs | Amber Brown | 2018-07-19 | 6 | -2/+4 |
| * | | | | | | | | | | Revert "0.33.0rc1 changelog" | Amber Brown | 2018-07-19 | 20 | -27/+10 |
* | | | | | | | | | | | Don't spew errors because we can't save metrics (#3563) | Amber Brown | 2018-07-19 | 3 | -6/+25 |
* | | | | | | | | | | | Merge pull request #3507 from Peetz0r/patch-1 | Richard van der Hoff | 2018-07-19 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | change http links to https | Peter | 2018-07-10 | 1 | -8/+8 |
* | | | | | | | | | | | revert 00bc979 | Richard van der Hoff | 2018-07-19 | 1 | -4/+3 |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.0' into develop | Richard van der Hoff | 2018-07-19 | 23 | -14/+33 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #3561 from matrix-org/rav/disable_logcontext_warning | Richard van der Hoff | 2018-07-19 | 2 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-19 | 1 | -0/+1 |
| | * | | | | | | | | | | Disable logcontext warning | Richard van der Hoff | 2018-07-19 | 1 | -3/+4 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | 0.33.0rc1 changelog v0.33.0rc1 | Amber Brown | 2018-07-18 | 20 | -10/+27 |
| * | | | | | | | | | | bump to 0.33.0rc1 | Amber Brown | 2018-07-18 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #3556 from matrix-org/rav/background_processes | Richard van der Hoff | 2018-07-19 | 9 | -104/+67 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Make Distributor run its processes as a background process | Richard van der Hoff | 2018-07-18 | 2 | -78/+22 |
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| * | | | | | | | | | | | Run things as background processes | Richard van der Hoff | 2018-07-18 | 7 | -26/+44 |
* | | | | | | | | | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 13 | -101/+116 |
* | | | | | | | | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_code | Erik Johnston | 2018-07-19 | 2 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pep8 | Erik Johnston | 2018-07-18 | 1 | -1/+2 |
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-18 | 1 | -0/+1 |
| * | | | | | | | | | | | | Add response code to response timer metrics | Erik Johnston | 2018-07-18 | 1 | -3/+5 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #3559 from matrix-org/rav/pep8_config | Amber Brown | 2018-07-19 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| * | | | | | | | | | | | add config for pep8 | Richard van der Hoff | 2018-07-18 | 1 | -3/+8 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #3553 from matrix-org/rav/background_process_tracking | Richard van der Hoff | 2018-07-18 | 3 | -5/+187 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-18 | 1 | -0/+1 |
| * | | | | | | | | | | Resource tracking for background processes | Richard van der Hoff | 2018-07-18 | 2 | -5/+186 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-18 | 2 | -43/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add changelog | Richard van der Hoff | 2018-07-04 | 1 | -0/+1 |
| * | | | | | | | | | | Merge branch 'develop' into rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-04 | 152 | -642/+2188 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove event re-signing hacks | Richard van der Hoff | 2018-06-07 | 1 | -43/+0 |
* | | | | | | | | | | | | Merge pull request #3514 from matrix-org/dbkr/turn_dont_add_defaults | David Baker | 2018-07-18 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | I failed to correctly guess the PR number | David Baker | 2018-07-11 | 1 | -0/+0 |
| * | | | | | | | | | | | Comment dummy TURN parameters in default config | David Baker | 2018-07-11 | 2 | -2/+3 |
* | | | | | | | | | | | | Merge pull request #3546 from matrix-org/rav/fix_erasure_over_federation | Richard van der Hoff | 2018-07-17 | 3 | -56/+133 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | add a comment | Richard van der Hoff | 2018-07-17 | 1 | -0/+2 |
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| * | | | | | | | | | | | | Fix visibility of events from erased users over federation | Richard van der Hoff | 2018-07-17 | 2 | -56/+130 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 4 | -138/+409 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fix imports | Richard van der Hoff | 2018-07-17 | 2 | -0/+2 |
| * | | | | | | | | | | | | add a comment | Richard van der Hoff | 2018-07-17 | 1 | -0/+2 |
| * | | | | | | | | | | | | Changelog | Richard van der Hoff | 2018-07-16 | 1 | -0/+1 |
| * | | | | | | | | | | | | Attempt to make _filter_events_for_server more efficient | Richard van der Hoff | 2018-07-16 | 1 | -17/+23 |
| * | | | | | | | | | | | | Add a test which profiles filter_events_for_server in a large room | Richard van der Hoff | 2018-07-16 | 1 | -2/+155 |
| * | | | | | | | | | | | | Move filter_events_for_server out of FederationHandler | Richard van der Hoff | 2018-07-16 | 3 | -138/+245 |
* | | | | | | | | | | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 13 | -934/+939 |
* | | | | | | | | | | | | | Merge pull request #3544 from matrix-org/erikj/fixup_stream_cache | Erik Johnston | 2018-07-17 | 3 | -1/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Use efficient .intersection | Erik Johnston | 2018-07-17 | 1 | -4/+1 |
| * | | | | | | | | | | | | | Add unit test | Erik Johnston | 2018-07-17 | 1 | -0/+16 |
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-17 | 1 | -0/+0 |
| * | | | | | | | | | | | | | Fix perf regression in PR #3530 | Erik Johnston | 2018-07-17 | 1 | -1/+6 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cache | Amber Brown | 2018-07-17 | 3 | -11/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fixup unit test | Erik Johnston | 2018-07-13 | 1 | -3/+3 |
| * | | | | | | | | | | | | | Newsfile | Erik Johnston | 2018-07-13 | 1 | -0/+0 |
| * | | | | | | | | | | | | | Don't return unknown entities in get_entities_changed | Erik Johnston | 2018-07-13 | 1 | -8/+1 |
* | | | | | | | | | | | | | | Merge pull request #3540 from krombel/enforce_isort | Amber Brown | 2018-07-17 | 8 | -9/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | rename 'isort' to 'check_isort' as requested | Krombel | 2018-07-16 | 2 | -3/+3 |
| * | | | | | | | | | | | | | | rerun isort with latest version | Krombel | 2018-07-16 | 6 | -20/+4 |
| * | | | | | | | | | | | | | | check isort by travis | Krombel | 2018-07-16 | 14 | -13/+37 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 3 | -2/+5 |
* | | | | | | | | | | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 18 | -165/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | fix sytests | Amber Brown | 2018-07-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | add changelog | Krombel | 2018-07-13 | 2 | -1/+2 |
| * | | | | | | | | | | | | | | rename assert_params_in_request to assert_params_in_dict | Krombel | 2018-07-13 | 11 | -33/+33 |
| * | | | | | | | | | | | | | | Use parse_{int,str} and assert from http.servlet | Krombel | 2018-07-13 | 14 | -155/+91 |
* | | | | | | | | | | | | | | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 10 | -98/+97 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queue | Richard van der Hoff | 2018-07-13 | 3 | -10/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | better changelog | Richard van der Hoff | 2018-07-13 | 1 | -1/+1 |
| * | | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Fix unit tests | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
| * | | | | | | | | | | | | | Make FederationRateLimiter queue requests properly | Richard van der Hoff | 2018-07-13 | 1 | -10/+23 |
| |/ / / / / / / / / / / / | |||||
* / / / / / / / / / / / / | typo | Matthew Hodgson | 2018-07-13 | 1 | -3/+3 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #3521 from matrix-org/rav/optimise_stream_change_cache | Richard van der Hoff | 2018-07-12 | 2 | -8/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | changelog | Richard van der Hoff | 2018-07-12 | 1 | -0/+1 |
| * | | | | | | | | | | | | Reduce set building in get_entities_changed | Richard van der Hoff | 2018-07-12 | 1 | -8/+12 |
* | | | | | | | | | | | | | Merge pull request #3316 from matrix-org/rav/enforce_report_api | Richard van der Hoff | 2018-07-12 | 2 | -2/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | |