| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #3620 from fuzzmz/return-404-room-not-found | Richard van der Hoff | 2018-08-01 | 1 | -2/+2 |
|\ |
|
| * | return NotFoundError if room not found | Serban Constantin | 2018-07-31 | 1 | -2/+2 |
* | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 14 | -48/+96 |
* | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layer | Richard van der Hoff | 2018-08-01 | 1 | -14/+14 |
|\ \ |
|
| * | | rename replication_layer to federation_client | Richard van der Hoff | 2018-07-31 | 1 | -14/+14 |
* | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decorator | Richard van der Hoff | 2018-08-01 | 1 | -67/+64 |
|\ \ \
| |_|/
|/| | |
|
| * | | fix invalidation | Richard van der Hoff | 2018-07-27 | 1 | -1/+1 |
| * | | Rewrite cache list decorator | Richard van der Hoff | 2018-07-27 | 1 | -67/+64 |
* | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failures | Travis Ralston | 2018-07-31 | 5 | -96/+7 |
|\ \ \
| |_|/
|/| | |
|
| * | | Remove pdu_failures from transactions | Travis Ralston | 2018-07-30 | 5 | -96/+7 |
* | | | Merge pull request #3612 from matrix-org/rav/store_heirarchy | Richard van der Hoff | 2018-07-31 | 6 | -6/+10 |
|\ \ \ |
|
| * | | | reinstate explicit include of EventsWorkerStore | Richard van der Hoff | 2018-07-31 | 1 | -1/+3 |
| * | | | Make EventStore inherit from EventFederationStore | Richard van der Hoff | 2018-07-26 | 6 | -7/+9 |
* | | | | Only import secrets when available | Krombel | 2018-07-30 | 1 | -4/+3 |
| |/ /
|/| | |
|
* | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 4 | -7/+42 |
| |/
|/| |
|
* | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 1 | -0/+4 |
|\ \ |
|
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_... | Michael Telatynski | 2018-07-24 | 332 | -10409/+26535 |
| |\ \ |
|
| * | | | if inviter_display_name == ""||None then default to inviter MXID | Michael Telatynski | 2018-06-13 | 1 | -0/+4 |
* | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leave | Richard van der Hoff | 2018-07-26 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Update the send_leave path to be an event_id | Travis Ralston | 2018-07-26 | 1 | -2/+2 |
* | | | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_content | Richard van der Hoff | 2018-07-26 | 3 | -2/+98 |
|\ \ \ \ \ |
|
| * | | | | | Create the column nullable | Richard van der Hoff | 2018-07-26 | 2 | -9/+13 |
| * | | | | | Stop populating events.content | Richard van der Hoff | 2018-07-26 | 2 | -1/+93 |
* | | | | | | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 2 | -25/+71 |
* | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_id | Richard van der Hoff | 2018-07-26 | 2 | -8/+6 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Remove some redundant joins on event_edges.room_id | Richard van der Hoff | 2018-07-26 | 2 | -8/+6 |
| |/ / / / |
|
* | | | | | Merge pull request #3610 from matrix-org/rav/fix_looping_calls | Richard van der Hoff | 2018-07-26 | 12 | -15/+23 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 12 | -15/+23 |
| | |_|/
| |/| | |
|
* / | | | 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 | 3 | -62/+212 |
|\ \ \ |
|
| * | | | 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 | 23 | -231/+349 |
| |\ \ \ |
|
| * | | | | 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 | 1 | -12/+4 |
| |\ \ \ \ |
|
| * | | | | | 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 | 13 | -316/+409 |
| |\ \ \ \ \ |
|
| * | | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 2 | -30/+18 |
| * | | | | | | handle case where types is [] on postgres correctly | Matthew Hodgson | 2018-07-23 | 1 | -1/+1 |
| * | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 25 | -274/+646 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | incorporate review | Matthew Hodgson | 2018-07-23 | 2 | -52/+35 |
| * | | | | | | | 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 | 271 | -2455/+3532 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 20 | -124/+176 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 54 | -166/+398 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 2 | -27/+67 |
| * | | | | | | | | | | merge develop | Matthew Hodgson | 2018-05-29 | 186 | -2989/+5608 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | 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 | 34 | -301/+515 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | | | 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 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | 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 | 2 | -5/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Fix another logcontext leak in _persist_events | Richard van der Hoff | 2018-07-25 | 2 | -5/+10 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_error | Richard van der Hoff | 2018-07-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Fix occasional 'tuple index out of range' error | Richard van der Hoff | 2018-07-25 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cache | Richard van der Hoff | 2018-07-25 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Fix updating of cached remote profiles | Richard van der Hoff | 2018-07-25 | 1 | -1/+8 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Fix unit tests | Richard van der Hoff | 2018-07-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Wrap a number of things that run in the background | Richard van der Hoff | 2018-07-25 | 9 | -22/+63 |
|/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | 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 | 1 | -53/+118 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | 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 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | 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 | 3 | -62/+97 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_events | Richard van der Hoff | 2018-07-23 | 2 | -8/+8 |
| * | | | | | | | | | | | | 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 | 3 | -46/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|/ / / / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 14 | -317/+429 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | |
|
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-23 | 19 | -179/+400 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Remove redundant checks on room forgottenness | Richard van der Hoff | 2018-07-23 | 3 | -46/+1 |
* | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c... | Erik Johnston | 2018-07-24 | 13 | -315/+408 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / / /
| |/| | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 10 | -295/+380 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #3555 from matrix-org/erikj/client_apis_move | Erik Johnston | 2018-07-24 | 9 | -284/+359 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 12 | -126/+305 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / / / / /
| | | | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_api... | Erik Johnston | 2018-07-23 | 33 | -223/+683 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | 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 |
| | | * | | | | | | | | | | | | | 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 |
| | * | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | Logcontext fixes | Richard van der Hoff | 2018-07-24 | 3 | -16/+19 |
| |/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | Remove unnecessary if | Erik Johnston | 2018-07-24 | 1 | -2/+1 |
* | | | | | | | | | | | | | | Speed up _calculate_state_delta | Erik Johnston | 2018-07-24 | 1 | -10/+3 |
|/ / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Comments | Erik Johnston | 2018-07-23 | 2 | -2/+6 |
* | | | | | | | | | | | | | Only get cached state from context in persist_event | Erik Johnston | 2018-07-23 | 2 | -1/+16 |
| |_|_|/ / / / / / / / /
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | Fix missing attributes on workers. | Erik Johnston | 2018-07-23 | 3 | -8/+14 |
* | | | | | | | | | | | | Fix EventContext when using workers | Erik Johnston | 2018-07-23 | 1 | -7/+7 |
* | | | | | | | | | | | | Update docstrings to make sense | Erik Johnston | 2018-07-23 | 1 | -5/+8 |
* | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | Refcator EventContext to accept state during init | Erik Johnston | 2018-07-23 | 2 | -63/+82 |
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge branch 'develop' into matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 56 | -672/+1056 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 6 | -25/+32 |
| * | | | | | | | | | | | Test and fix support for cancellation in Linearizer | Richard van der Hoff | 2018-07-20 | 1 | -6/+22 |
| | |/ / / / / / / / /
| |/| | | | | | | | | |
|
| * | | | | | | | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixes | Richard van der Hoff | 2018-07-20 | 2 | -94/+39 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 2 | -91/+12 |
| | * | | | | | | | | | | 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 | 1 | -3/+20 |
| * | | | | | | | | | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 3 | -0/+169 |
| |/ / / / / / / / / / |
|
| * | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-07-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | 0.33 final | Amber Brown | 2018-07-19 | 1 | -1/+1 |
| * | | | | | | | | | | | Don't spew errors because we can't save metrics (#3563) | Amber Brown | 2018-07-19 | 2 | -6/+24 |
| | |_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | |
|
| * | | | | | | | | | | 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 | 2 | -4/+5 |
| |\| | | | | | | | | |
|
| | * | | | | | | | | | Disable logcontext warning | Richard van der Hoff | 2018-07-19 | 1 | -3/+4 |
| | * | | | | | | | | | 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 | 7 | -52/+62 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Make Distributor run its processes as a background process | Richard van der Hoff | 2018-07-18 | 1 | -26/+18 |
| | * | | | | | | | | | | 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 | 6 | -15/+88 |
| * | | | | | | | | | | | Merge pull request #3554 from matrix-org/erikj/response_metrics_code | Erik Johnston | 2018-07-19 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | pep8 | Erik Johnston | 2018-07-18 | 1 | -1/+2 |
| | * | | | | | | | | | | Add response code to response timer metrics | Erik Johnston | 2018-07-18 | 1 | -3/+5 |
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| * | | | | | | | | | | Merge pull request #3553 from matrix-org/rav/background_process_tracking | Richard van der Hoff | 2018-07-18 | 2 | -5/+186 |
| |\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / /
| |/| | | | | | | | | |
|
| | * | | | | | | | | | 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 | 1 | -43/+0 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' into rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-04 | 101 | -571/+1178 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | 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 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / /
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | Comment dummy TURN parameters in default config | David Baker | 2018-07-11 | 1 | -2/+2 |
| * | | | | | | | | | | | add a comment | Richard van der Hoff | 2018-07-17 | 1 | -0/+2 |
| * | | | | | | | | | | | Fix visibility of events from erased users over federation | Richard van der Hoff | 2018-07-17 | 1 | -56/+67 |
| * | | | | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 2 | -138/+147 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | fix imports | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| | * | | | | | | | | | | | add a comment | Richard van der Hoff | 2018-07-17 | 1 | -0/+2 |
| | * | | | | | | | | | | | Attempt to make _filter_events_for_server more efficient | Richard van der Hoff | 2018-07-16 | 1 | -17/+23 |
| | * | | | | | | | | | | | Move filter_events_for_server out of FederationHandler | Richard van der Hoff | 2018-07-16 | 2 | -138/+138 |
| * | | | | | | | | | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 2 | -3/+4 |
| * | | | | | | | | | | | | Use efficient .intersection | Erik Johnston | 2018-07-17 | 1 | -4/+1 |
| * | | | | | | | | | | | | 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 | 1 | -8/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | Don't return unknown entities in get_entities_changed | Erik Johnston | 2018-07-13 | 1 | -8/+1 |
| * | | | | | | | | | | | | | rerun isort with latest version | Krombel | 2018-07-16 | 6 | -20/+4 |
| * | | | | | | | | | | | | | check isort by travis | Krombel | 2018-07-16 | 11 | -11/+27 |
| * | | | | | | | | | | | | | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 2 | -2/+5 |
| * | | | | | | | | | | | | | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 17 | -165/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | fix sytests | Amber Brown | 2018-07-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | add changelog | Krombel | 2018-07-13 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | 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 | 8 | -97/+93 |
| |/ / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queue | Richard van der Hoff | 2018-07-13 | 1 | -10/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | 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 | 1 | -8/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Reduce set building in get_entities_changed | Richard van der Hoff | 2018-07-12 | 1 | -8/+12 |
| * | | | | | | | | | | | | Merge branch 'develop' into rav/enforce_report_api | Richard van der Hoff | 2018-07-12 | 270 | -2247/+3387 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge pull request #3505 from matrix-org/erikj/receipts_cahce | Erik Johnston | 2018-07-12 | 2 | -7/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | Update return value docstring | Erik Johnston | 2018-07-12 | 1 | -1/+1 |
| | | * | | | | | | | | | | Use 'is not None' and add comments | Erik Johnston | 2018-07-10 | 1 | -2/+6 |
| | | * | | | | | | | | | | Use stream cache in get_linearized_receipts_for_room | Erik Johnston | 2018-07-10 | 2 | -5/+14 |
| * | | | | | | | | | | | | Enforce the specified API for report_event | Richard van der Hoff | 2018-05-31 | 1 | -2/+23 |
* | | | | | | | | | | | | | add trailing comma | Matthew Hodgson | 2018-07-23 | 1 | -1/+1 |
* | | | | | | | | | | | | | yes, we do need to invalidate the device_id_exists_cache when deleting a remo... | Matthew Hodgson | 2018-07-19 | 1 | -1/+0 |
* | | | | | | | | | | | | | spell out that include_deleted_devices requires include_all_devices | Matthew Hodgson | 2018-07-19 | 1 | -1/+5 |
* | | | | | | | | | | | | | shift to using an explicit deleted flag on m.device_list_update EDUs | Matthew Hodgson | 2018-07-12 | 2 | -20/+25 |
* | | | | | | | | | | | | | WIP to announce deleted devices over federation | Matthew Hodgson | 2018-07-12 | 3 | -14/+44 |
| |/ / / / / / / / / / /
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | s/becuase/because/g | Matthew Hodgson | 2018-07-10 | 3 | -4/+4 |
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Attempt to include db threads in cpu usage stats (#3496) | Richard van der Hoff | 2018-07-10 | 3 | -20/+38 |
* | | | | | | | | | | | Refactor logcontext resource usage tracking (#3501) | Richard van der Hoff | 2018-07-10 | 4 | -130/+146 |
* | | | | | | | | | | | another typo | Matthew Hodgson | 2018-07-10 | 1 | -1/+1 |
* | | | | | | | | | | | typo (i think) | Matthew Hodgson | 2018-07-10 | 1 | -1/+1 |
* | | | | | | | | | | | Add CPU metrics for _fetch_event_list | Richard van der Hoff | 2018-07-09 | 1 | -19/+32 |
* | | | | | | | | | | | run isort | Amber Brown | 2018-07-09 | 258 | -1312/+1336 |
* | | | | | | | | | | | version | Amber Brown | 2018-07-07 | 1 | -1/+1 |
* | | | | | | | | | | | Correct attrs package name in requirements (#3492) | Amber Brown | 2018-07-07 | 1 | -1/+1 |
* | | | | | | | | | | | Prepare 0.32.1 release v0.32.1 github/release-v0.32.1 release-v0.32.1 | Richard van der Hoff | 2018-07-06 | 1 | -1/+1 |
* | | | | | | | | | | | Add explicit dependency on netaddr | Richard van der Hoff | 2018-07-06 | 1 | -3/+1 |
* | | | | | | | | | | | 0.32.0 version bump, update changelog v0.32.0 github/release-v0.32.0 release-v0.32.0 | Neil Johnson | 2018-07-06 | 1 | -1/+1 |
* | | | | | | | | | | | bump version to 0.32.0rc1 | Amber Brown | 2018-07-05 | 1 | -1/+1 |
* | | | | | | | | | | | Implementation of server_acls | Richard van der Hoff | 2018-07-04 | 3 | -4/+156 |
* | | | | | | | | | | | More server_name validation | Richard van der Hoff | 2018-07-04 | 3 | -9/+54 |
* | | | | | | | | | | | Merge pull request #3473 from matrix-org/erikj/thread_cache | Erik Johnston | 2018-07-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Invalidate cache on correct thread | Erik Johnston | 2018-07-02 | 1 | -1/+2 |
* | | | | | | | | | | | | Merge pull request #3474 from matrix-org/erikj/py3_auth | Erik Johnston | 2018-07-04 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Avoid relying on int vs None comparison | Erik Johnston | 2018-07-02 | 1 | -1/+5 |
| * | | | | | | | | | | | Ensure that we define sender_domain | Erik Johnston | 2018-07-02 | 1 | -0/+1 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 2 | -25/+75 |
* | | | | | | | | | | | replace invalid utf8 with \ufffd | Matthew Hodgson | 2018-07-02 | 1 | -2/+2 |
* | | | | | | | | | | | a fix which doesn't NPE everywhere | Matthew Hodgson | 2018-07-01 | 1 | -9/+17 |
* | | | | | | | | | | | don't mix unicode strings with utf8-in-byte-strings | Matthew Hodgson | 2018-07-01 | 1 | -2/+9 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 2 | -29/+71 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | try and clean up | Amber Brown | 2018-06-27 | 1 | -3/+6 |
| * | | | | | | | | | | pep8 | Amber Brown | 2018-06-27 | 1 | -6/+4 |
| * | | | | | | | | | | cleanups | Amber Brown | 2018-06-27 | 1 | -13/+15 |
| * | | | | | | | | | | handle federation not telling us about prev_events | Amber Brown | 2018-06-27 | 2 | -26/+65 |
* | | | | | | | | | | | fix tests | Matthew Hodgson | 2018-06-28 | 1 | -0/+1 |
* | | | | | | | | | | | add ip_range_whitelist parameter to limit where ASes can connect from | Matthew Hodgson | 2018-06-28 | 3 | -2/+19 |
* | | | | | | | | | | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 39 | -62/+78 |
* | | | | | | | | | | | Revert "Revert "Try to not use as much CPU in the StreamChangeCache"" (#3454) | Amber Brown | 2018-06-28 | 1 | -2/+4 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | Revert "Try to not use as much CPU in the StreamChangeCache" | Matthew Hodgson | 2018-06-26 | 1 | -4/+2 |
* | | | | | | | | | | Merge pull request #3451 from matrix-org/hawkowl/sorteddict-api | Matthew Hodgson | 2018-06-26 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | fixes | Amber Brown | 2018-06-26 | 1 | -2/+2 |
| * | | | | | | | | | | fixes | Amber Brown | 2018-06-26 | 1 | -2/+2 |
| * | | | | | | | | | | try and make loading items from the cache faster | Amber Brown | 2018-06-26 | 1 | -2/+4 |
* | | | | | | | | | | | Fix error on deleting users pending deactivation | David Baker | 2018-06-26 | 1 | -1/+3 |
* | | | | | | | | | | | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-api | Matthew Hodgson | 2018-06-26 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / /
|/| | | | | | | | | | |
|
| * | | | | | | | | | | update doc for deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -1/+1 |
| * | | | | | | | | | | add GDPR erase param to deactivate API | Matthew Hodgson | 2018-06-26 | 2 | -1/+13 |
* | | | | | | | | | | | Merge pull request #3438 from turt2live/travis/dont-print-access-tokens-in-logs | Amber Brown | 2018-06-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Don't print invalid access tokens in the logs | Travis Ralston | 2018-06-24 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-parts | Erik Johnston | 2018-06-25 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|