| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 1 | -1/+14 |
* | | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 10 | -31/+74 |
| |/
|/| |
|
* | | Implement trail users | Erik Johnston | 2018-08-23 | 2 | -1/+32 |
* | | Add missing yield | Erik Johnston | 2018-08-23 | 1 | -1/+2 |
* | | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 2 | -31/+31 |
|\ \ |
|
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-17 | 9 | -134/+217 |
| |\ \ |
|
| * | | | Remote profile cache should remain in master worker | Erik Johnston | 2018-08-17 | 1 | -4/+2 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof... | Erik Johnston | 2018-08-09 | 7 | -34/+272 |
| |\ \ \ |
|
| * | | | | Allow ratelimiting on workers | Erik Johnston | 2018-08-07 | 1 | -29/+29 |
| * | | | | Allow profile changes to happen on workers | Erik Johnston | 2018-08-07 | 1 | -2/+4 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 1 | -1/+3 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2018-08-20 | 9 | -134/+217 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Choose state algorithm based on room version | Erik Johnston | 2018-08-09 | 1 | -1/+3 |
| | |_|/
| |/| | |
|
* | | | | Split the state_group_cache in two (#3726) | Matthew Hodgson | 2018-08-22 | 1 | -17/+141 |
| |/ /
|/| | |
|
* | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -1/+4 |
* | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 3 | -8/+8 |
* | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 2 | -3/+65 |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-15 | 4 | -24/+41 |
|\ \ \ |
|
| * | | | adding missing yield | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| * | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 1 | -5/+5 |
| |\ \ \ |
|
| | * | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 1 | -5/+5 |
| | |/ / |
|
| * | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po... | Amber Brown | 2018-08-14 | 1 | -0/+5 |
| |\ \ \ |
|
| | * | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 1 | -0/+5 |
| * | | | | fix sqlite/postgres incompatibility in reap_monthly_active_users | Neil Johnson | 2018-08-11 | 1 | -16/+28 |
| |/ / / |
|
| * / / | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 2 | -2/+2 |
| |/ / |
|
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede... | Erik Johnston | 2018-08-09 | 7 | -34/+272 |
|\| | |
|
| * | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 1 | -3/+30 |
| |\ \ |
|
| | * | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 1 | -3/+30 |
| | |/ |
|
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u... | Neil Johnson | 2018-08-08 | 3 | -5/+10 |
| |\ \ |
|
| | * \ | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 5 | -28/+195 |
| | |\ \ |
|
| | | * | | typos | Neil Johnson | 2018-08-08 | 2 | -3/+3 |
| | * | | | Fix occasional glitches in the synapse_event_persisted_position metric | Richard van der Hoff | 2018-08-07 | 1 | -3/+8 |
| | | |/
| | |/| |
|
| * | | | prevent total number of reserved users being too large | Neil Johnson | 2018-08-07 | 1 | -1/+3 |
| * | | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 1 | -11/+34 |
| * | | | WIP building out mau reserved users | Neil Johnson | 2018-08-06 | 1 | -1/+15 |
| | |/
| |/| |
|
| * | | Fix postgres compatibility bug | Neil Johnson | 2018-08-06 | 1 | -4/+15 |
| * | | make use of _simple_select_one_onecol, improved comments | Neil Johnson | 2018-08-06 | 2 | -8/+15 |
| * | | bug fixes | Neil Johnson | 2018-08-03 | 1 | -2/+1 |
| * | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 2 | -38/+49 |
| * | | fix caching and tests | Neil Johnson | 2018-08-03 | 1 | -48/+43 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 3 | -8/+27 |
| |\| |
|
| * | | typo | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| * | | wip attempt at caching | Neil Johnson | 2018-08-02 | 1 | -9/+47 |
| * | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 1 | -7/+8 |
| * | | remove unused count_monthly_users | Neil Johnson | 2018-08-02 | 1 | -25/+0 |
| * | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 3 | -7/+35 |
| * | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-02 | 2 | -1/+3 |
| |\ \ |
|
| | * | | self.db_conn unused | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | * | | normalise reaping query | Neil Johnson | 2018-08-01 | 1 | -3/+38 |
| * | | | Revert "change monthly_active_users table to be a single column" | Neil Johnson | 2018-08-02 | 2 | -4/+10 |
| |/ / |
|
| * | | change monthly_active_users table to be a single column | Neil Johnson | 2018-08-01 | 2 | -10/+4 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-01 | 7 | -11/+47 |
| |\ \ |
|
| * | | | clean up | Neil Johnson | 2018-08-01 | 1 | -15/+3 |
| * | | | fix comment | Neil Johnson | 2018-08-01 | 1 | -1/+1 |
| * | | | api into monthly_active_users table | Neil Johnson | 2018-07-31 | 4 | -2/+114 |
* | | | | Pull in necessary stores in federation_reader | Erik Johnston | 2018-08-06 | 1 | -1/+0 |
* | | | | Move necessary storage functions to worker classes | Erik Johnston | 2018-08-06 | 3 | -98/+100 |
| |_|/
|/| | |
|
* | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 2 | -6/+15 |
|\ \ \ |
|
| * | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 2 | -35/+15 |
| * | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 1 | -0/+29 |
* | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 1 | -2/+12 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | update docs | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_... | Erik Johnston | 2018-07-30 | 11 | -67/+225 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 1 | -2/+12 |
* | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 2 | -1/+27 |
|\ \ \ \ |
|
| * | | | | improve clarity | Neil Johnson | 2018-08-01 | 1 | -4/+5 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i... | Neil Johnson | 2018-08-01 | 6 | -6/+10 |
| |\ \ \ \ |
|
| * | | | | | remove errant print | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| * | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 1 | -13/+13 |
| * | | | | | coding style | Neil Johnson | 2018-07-31 | 2 | -3/+2 |
| * | | | | | actually close conn | Neil Johnson | 2018-07-30 | 1 | -4/+8 |
| * | | | | | factor out metrics from __init__ to app/homeserver | Neil Johnson | 2018-07-30 | 1 | -24/+13 |
| * | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 1 | -0/+34 |
| | |_|/ /
| |/| | | |
|
* | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -5/+11 |
| |/ / /
|/| | | |
|
* | | | | 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 |
* | | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 1 | -3/+11 |
* | | | | 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 |
* | | | | | 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 | 5 | -6/+8 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 5 | -6/+8 |
| |/ / / |
|
* / / / | comment on event_edges | Richard van der Hoff | 2018-07-26 | 1 | -1/+2 |
|/ / / |
|
* | | | 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 | 8 | -125/+187 |
|\| | |
|
| * | | 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 |
| | |/ / |
|
| * / / | Wrap a number of things that run in the background | Richard van der Hoff | 2018-07-25 | 4 | -10/+26 |
| |/ / |
|
| * | | Pull out did_forget to worker store | Erik Johnston | 2018-07-24 | 1 | -25/+27 |
| * | | 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 #3583 from matrix-org/rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 2 | -28/+0 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 2 | -15/+31 |
| | |\ \ |
|
| | * \ \ | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-23 | 5 | -26/+70 |
| | |\ \ \ |
|
| | * | | | | Remove redundant checks on room forgottenness | Richard van der Hoff | 2018-07-23 | 2 | -28/+0 |
* | | | | | | 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 |
|\| | | | | |
|
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c... | Erik Johnston | 2018-07-24 | 2 | -13/+24 |
| |\ \ \ \ \
| | | |_|/ /
| | |/| | | |
|
| * | | | | | Remove unnecessary if | Erik Johnston | 2018-07-24 | 1 | -2/+1 |
| * | | | | | Speed up _calculate_state_delta | Erik Johnston | 2018-07-24 | 1 | -10/+3 |
* | | | | | | consider non-filter_type types as wildcards, thus missing from the state-grou... | Matthew Hodgson | 2018-07-24 | 1 | -1/+4 |
* | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 2 | -14/+25 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 1 | -11/+21 |
| |\ \ \ \ \ |
|
| | * | | | | | 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 |
| | |/ / / / |
|
| * / / / / | Logcontext fixes | Richard van der Hoff | 2018-07-24 | 2 | -3/+4 |
| |/ / / / |
|
* | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 1 | -27/+9 |
* | | | | | 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 | 5 | -26/+75 |
|\| | | | |
|
| * | | | | Comments | Erik Johnston | 2018-07-23 | 1 | -0/+3 |
| * | | | | Only get cached state from context in persist_event | Erik Johnston | 2018-07-23 | 1 | -1/+3 |
| | |/ /
| |/| | |
|
| * | | | Use new getters | Erik Johnston | 2018-07-23 | 3 | -5/+11 |
| * | | | Merge branch 'develop' into matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 6 | -23/+49 |
| |\| | |
|
| * | | | 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 | 2 | -13/+43 |
* | | | | incorporate review | Matthew Hodgson | 2018-07-23 | 1 | -12/+8 |
* | | | | fix thinkos; unbreak tests | Matthew Hodgson | 2018-07-19 | 1 | -2/+2 |
* | | | | incorporate review | Matthew Hodgson | 2018-07-19 | 1 | -3/+4 |
* | | | | add a filtered_types param to limit filtering to specific types | Matthew Hodgson | 2018-07-19 | 1 | -53/+60 |
* | | | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 50 | -375/+550 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | 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 | 1 | -3/+4 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Disable logcontext warning | Richard van der Hoff | 2018-07-19 | 1 | -3/+4 |
| * | | | Run things as background processes | Richard van der Hoff | 2018-07-18 | 4 | -16/+29 |
| |/ / |
|
| * | | Merge pull request #3505 from matrix-org/erikj/receipts_cahce | Erik Johnston | 2018-07-12 | 1 | -6/+19 |
| |\ \
| | |/
| |/| |
|
| | * | 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 | 1 | -4/+13 |
| * | | s/becuase/because/g | Matthew Hodgson | 2018-07-10 | 1 | -2/+2 |
| |/ |
|
| * | Attempt to include db threads in cpu usage stats (#3496) | Richard van der Hoff | 2018-07-10 | 2 | -18/+17 |
| * | Add CPU metrics for _fetch_event_list | Richard van der Hoff | 2018-07-09 | 1 | -19/+32 |
| * | run isort | Amber Brown | 2018-07-09 | 49 | -246/+244 |
| * | Invalidate cache on correct thread | Erik Johnston | 2018-07-02 | 1 | -1/+2 |
| * | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 19 | -28/+35 |
| * | Fix error on deleting users pending deactivation | David Baker | 2018-06-26 | 1 | -1/+3 |
| * | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili... | Erik Johnston | 2018-06-25 | 3 | -0/+126 |
| * | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 3 | -126/+0 |
| * | Deleting from event_push_actions needs to use an index | Mark Haines | 2018-06-22 | 1 | -1/+8 |
| * | Merge pull request #3432 from matrix-org/rav/joined_hosts_cache_non_iterable | Richard van der Hoff | 2018-06-22 | 1 | -1/+1 |
| |\ |
|
| | * | Make _get_joined_hosts_cache cache non-iterable | Erik Johnston | 2018-06-22 | 1 | -1/+1 |
| * | | Merge pull request #3430 from matrix-org/rav/configurable_push_action_rotation | Richard van der Hoff | 2018-06-22 | 1 | -3/+5 |
| |\ \
| | |/
| |/| |
|
| | * | Make push actions rotation configurable | Erik Johnston | 2018-06-22 | 1 | -3/+5 |
| * | | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 3 | -0/+126 |
| |\ \ |
|
| | * | | UserErasureStore | Richard van der Hoff | 2018-06-12 | 3 | -0/+126 |
| * | | | Merge pull request #3427 from matrix-org/erikj/remove_filters | Erik Johnston | 2018-06-22 | 1 | -20/+1 |
| |\| |
| | |/
| |/| |
|
| | * | remove dead filter_events_for_clients | Richard van der Hoff | 2018-06-12 | 1 | -20/+1 |
| * | | Disable partial state group caching for wildcard lookups | Richard van der Hoff | 2018-06-22 | 1 | -13/+43 |
| * | | Merge pull request #3382 from matrix-org/rav/optimise_state_groups | Richard van der Hoff | 2018-06-22 | 1 | -5/+1 |
| |\ \ |
|
| | * | | Optimise state_group_cache update | Richard van der Hoff | 2018-06-11 | 1 | -5/+1 |
| * | | | Merge pull request #3419 from matrix-org/rav/events_per_request | Richard van der Hoff | 2018-06-22 | 1 | -0/+4 |
| |\ \ \ |
|
| | * | | | Indirect evt_count updates via method call | Richard van der Hoff | 2018-06-22 | 1 | -1/+1 |
| | * | | | Log number of events fetched from DB | Richard van der Hoff | 2018-06-21 | 1 | -0/+4 |
| | | |/
| | |/| |
|
| * / | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 4 | -9/+9 |
| |/ / |
|
| * | | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 1 | -9/+0 |
| |\ \ |
|
| | * \ | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 1 | -9/+6 |
| | |\ \ |
|
| | * | | | Hit the 3pid unbind endpoint on deactivation | David Baker | 2018-05-23 | 1 | -9/+0 |
* | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 2 | -29/+3 |
|\| | | | |
|
| * | | | | Fix sql error in _get_state_groups_from_groups | Richard van der Hoff | 2018-06-06 | 1 | -1/+1 |
| * | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_method | Richard van der Hoff | 2018-06-04 | 1 | -26/+0 |
| |\ \ \ \ |
|
| | * | | | | Remove was_forgotten_at | Richard van der Hoff | 2018-06-01 | 1 | -26/+0 |
| | | |_|/
| | |/| | |
|
| * / | | | Add hacky cache factor override system | Erik Johnston | 2018-06-04 | 1 | -2/+2 |
| |/ / / |
|
* | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 12 | -92/+179 |
|\| | | |
|
| * | | | Merge pull request #3264 from matrix-org/neil/sign-up-stats | Neil Johnson | 2018-06-01 | 3 | -1/+56 |
| |\ \ \ |
|
| | * | | | remove unnecessary INSERT | Neil Johnson | 2018-06-01 | 1 | -1/+0 |
| | * | | | create users index on creation_ts | Neil Johnson | 2018-05-29 | 1 | -0/+20 |
| | * | | | create index in background | Neil Johnson | 2018-05-29 | 1 | -0/+7 |
| | * | | | bump version | Neil Johnson | 2018-05-29 | 1 | -1/+1 |
| | * | | | daily user type phone home stats | Neil Johnson | 2018-05-22 | 1 | -0/+29 |
| | |/ / |
|
| * | | | Handle RRs which arrive before their events | Richard van der Hoff | 2018-06-01 | 1 | -25/+19 |
| * | | | Ignore depth when updating read-receipts | Richard van der Hoff | 2018-06-01 | 1 | -30/+37 |
| * | | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'... | Amber Brown | 2018-05-31 | 5 | -54/+59 |
| * | | | Merge pull request #3303 from NotAFile/py3-memoryview | Amber Brown | 2018-05-30 | 3 | -6/+30 |
| |\ \ \ |
|
| | * | | | add remaining memoryview changes | Adrian Tschira | 2018-05-29 | 2 | -4/+12 |
| | * | | | use memoryview in py3 | Adrian Tschira | 2018-05-29 | 2 | -2/+18 |
| * | | | | Merge pull request #3281 from NotAFile/py3-six-isinstance | Amber Brown | 2018-05-30 | 1 | -2/+3 |
| |\ \ \ \ |
|
| | * | | | | remaining isintance fixes | Adrian Tschira | 2018-05-24 | 1 | -2/+3 |
| * | | | | | Exempt AS-registered users from doing gdpr | Richard van der Hoff | 2018-05-29 | 1 | -0/+1 |
| | |/ / /
| |/| | | |
|
* | | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 1 | -22/+54 |
* | | | | | merge develop | Matthew Hodgson | 2018-05-29 | 40 | -519/+1165 |
|\| | | | |
|
| * | | | | update metrics to be in seconds | Amber Brown | 2018-05-28 | 1 | -15/+15 |
| * | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 10 | -43/+60 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge pull request #3279 from NotAFile/py3-more-iteritems | Amber Brown | 2018-05-24 | 1 | -4/+6 |
| | |\ \ \ \ |
|
| | | * | | | | more iteritems | Adrian Tschira | 2018-05-24 | 1 | -4/+6 |
| | | |/ / / |
|
| | * / / / | Misc. py3 fixes | Adrian Tschira | 2018-05-24 | 3 | -3/+3 |
| | |/ / / |
|
| | * | | | Merge pull request #3278 from NotAFile/py3-storage-base | Amber Brown | 2018-05-24 | 1 | -17/+22 |
| | |\ \ \ |
|
| | | * | | | Py3 storage/_base.py | Adrian Tschira | 2018-05-24 | 1 | -17/+22 |
| | | | |/
| | | |/| |
|
| | * | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 4 | -9/+16 |
| | |\ \ \ |
|
| | | * | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 4 | -9/+16 |
| | * | | | | Merge pull request #3247 from NotAFile/py3-misc | Amber Brown | 2018-05-24 | 1 | -1/+7 |
| | |\ \ \ \
| | | |_|/ /
| | |/| | | |
|
| | | * | | | use stand-in value if maxint is not available | Adrian Tschira | 2018-05-19 | 1 | -1/+7 |
| | | |/ / |
|
| | * | | | Remove unused string formatting param | Erik Johnston | 2018-05-22 | 1 | -1/+0 |
| | * | | | Don't support limitless pagination | Erik Johnston | 2018-05-22 | 1 | -8/+6 |
| | | |/
| | |/| |
|
| * | | | cleanup | Amber Brown | 2018-05-22 | 1 | -3/+6 |
| * | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 11 | -75/+286 |
| |\| | |
|
| | * | | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 2 | -7/+59 |
| | * | | Tighter filtering for user_daily_visits | Neil Johnson | 2018-05-18 | 1 | -1/+5 |
| | |/ |
|
| | * | fix psql compatability bug | Neil Johnson | 2018-05-18 | 1 | -1/+1 |
| | * | Merge pull request #3235 from matrix-org/rav/fix_receipts_deferred | Richard van der Hoff | 2018-05-18 | 1 | -7/+11 |
| | |\ |
|
| | | * | Fix error in handling receipts | Richard van der Hoff | 2018-05-18 | 1 | -7/+11 |
| | * | | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -24/+53 |
| | |\ \
| | | |/
| | |/| |
|
| | | * | Clarify comment | Erik Johnston | 2018-05-16 | 1 | -1/+2 |
| | | * | Comments | Erik Johnston | 2018-05-16 | 1 | -0/+8 |
| | | * | Move and rename variable | Erik Johnston | 2018-05-16 | 1 | -3/+3 |
| | | * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -8/+9 |
| | | * | Use events_to_purge table rather than token | Erik Johnston | 2018-05-15 | 1 | -15/+34 |
| | * | | Merge pull request #3212 from matrix-org/erikj/epa_stream | Erik Johnston | 2018-05-17 | 2 | -38/+16 |
| | |\ \ |
|
| | | * | | Use stream rather depth ordering for push actions | Erik Johnston | 2018-05-11 | 2 | -38/+16 |
| | * | | | Merge pull request #3163 from matrix-org/cohort_analytics | Neil Johnson | 2018-05-16 | 5 | -5/+113 |
| | |\ \ \ |
|
| | | * | | | remove empty line | Neil Johnson | 2018-05-16 | 1 | -1/+0 |
| | | * | | | style and further contraining query | Neil Johnson | 2018-05-16 | 1 | -8/+12 |
| | | * | | | Limit query load of generate_user_daily_visits | Neil Johnson | 2018-05-15 | 1 | -13/+47 |
| | | * | | | instead of inserting user daily visit data at the end of the day, instead ins... | Neil Johnson | 2018-05-14 | 1 | -40/+14 |
| | | * | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_a... | Neil Johnson | 2018-05-14 | 10 | -290/+380 |
| | | |\| | |
|
| | | * | | | remove user agent from data model, will just join on user_ips | Neil Johnson | 2018-05-01 | 1 | -12/+11 |
| | | * | | | add inidexes based on usage | Neil Johnson | 2018-05-01 | 1 | -6/+2 |
| | | * | | | pep8 | Neil Johnson | 2018-04-25 | 1 | -3/+4 |
| | | * | | | Generate user daily stats | Neil Johnson | 2018-04-25 | 5 | -5/+106 |
| | * | | | | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 2 | -0/+36 |
| | |\ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | | * | | | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 2 | -0/+36 |
| | | | |/
| | | |/| |
|
| * | / | | rest of the changes | Amber Brown | 2018-05-21 | 2 | -27/+18 |
| |/ / / |
|
| * | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate | David Baker | 2018-05-14 | 2 | -0/+64 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Many docstrings | David Baker | 2018-05-10 | 1 | -0/+12 |
| | * | | Add the schema file | David Baker | 2018-05-09 | 1 | -0/+25 |
| | * | | Part deactivated users in the background | David Baker | 2018-05-09 | 1 | -0/+27 |
| * | | | Merge pull request #3199 from matrix-org/erikj/pagination_sync | Erik Johnston | 2018-05-09 | 1 | -39/+36 |
| |\ \ \ |
|
| | * | | | Refactor sync APIs to reuse pagination API | Erik Johnston | 2018-05-09 | 1 | -38/+35 |
| | * | | | Don't unnecessarily require token to be stream token | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| * | | | | Merge pull request #3198 from matrix-org/erikj/fixup_return_pagination | Erik Johnston | 2018-05-09 | 1 | -1/+15 |
| |\ \ \ \ |
|
| | * | | | | Fix up comment | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_retu... | Erik Johnston | 2018-05-09 | 1 | -5/+6 |
| | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Refactor get_recent_events_for_room return type | Erik Johnston | 2018-05-09 | 1 | -1/+15 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_mem... | Erik Johnston | 2018-05-09 | 1 | -5/+6 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|