Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 | |
| | * | | | | | | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 12 | -22/+240 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 3 | -6/+54 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hs | Neil Johnson | 2018-08-08 | 4 | -37/+69 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 2 | -8/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 3 | -0/+9 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... | Neil Johnson | 2018-08-09 | 21 | -298/+667 | |
|\| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Amber Brown | 2018-08-09 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | 0.33.2 | Amber Brown | 2018-08-09 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | fix for rc1 v0.33.2rc1 | Amber Brown | 2018-08-07 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | version | Amber Brown | 2018-08-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 5 | -274/+395 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Fixup wording and remove dead code | Erik Johnston | 2018-08-09 | 1 | -2/+1 | |
| | * | | | | | | | | | | | | | | | | Rename POST param to METHOD | Erik Johnston | 2018-08-08 | 2 | -13/+22 | |
| | * | | | | | | | | | | | | | | | | Fixup logging and docstrings | Erik Johnston | 2018-08-08 | 2 | -2/+40 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fix isort | Erik Johnston | 2018-08-06 | 1 | -4/+1 | |
| | * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r... | Erik Johnston | 2018-08-03 | 40 | -601/+707 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 2 | -195/+108 | |
| | * | | | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 2 | -86/+40 | |
| | * | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints | Erik Johnston | 2018-07-31 | 1 | -0/+208 | |
| * | | | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 3 | -1/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | fix metric name | Richard van der Hoff | 2018-08-07 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 3 | -1/+32 | |
| | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 12 | -22/+239 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 3 | -15/+5 | |
| | * | | | | | | | | | | | | | | | Check m.room.create for sane room_versions | Richard van der Hoff | 2018-08-06 | 2 | -4/+32 | |
| | * | | | | | | | | | | | | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 4 | -8/+25 | |
| | * | | | | | | | | | | | | | | | sanity check response from make_join | Richard van der Hoff | 2018-08-03 | 1 | -1/+3 | |
| | * | | | | | | | | | | | | | | | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 3 | -4/+63 | |
| | * | | | | | | | | | | | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 6 | -5/+79 | |
| | * | | | | | | | | | | | | | | | Docstrings for BaseFederationServlet | Richard van der Hoff | 2018-08-03 | 1 | -0/+47 | |
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
* | / | | | | | | | | | | | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 1 | -5/+11 | |
|/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u... | Neil Johnson | 2018-08-08 | 4 | -36/+68 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 10 | -53/+220 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | 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 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 1 | -31/+58 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | 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 | 3 | -12/+41 | |
* | | | | | | | | | | | | WIP building out mau reserved users | Neil Johnson | 2018-08-06 | 1 | -1/+15 | |
* | | | | | | | | | | | | load mau limit threepids | Neil Johnson | 2018-08-06 | 1 | -0/+3 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Fix postgres compatibility bug | Neil Johnson | 2018-08-06 | 1 | -4/+15 | |
| |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | update comments to reflect new sig | Neil Johnson | 2018-08-06 | 1 | -4/+1 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | make use of _simple_select_one_onecol, improved comments | Neil Johnson | 2018-08-06 | 2 | -8/+15 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 | |
* | | | | | | | | bug fixes | Neil Johnson | 2018-08-03 | 3 | -19/+7 | |
* | | | | | | | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 3 | -40/+53 | |
* | | | | | | | | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 1 | -2/+2 | |
* | | | | | | | | fix caching and tests | Neil Johnson | 2018-08-03 | 2 | -49/+43 | |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 18 | -376/+433 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 8 | -142/+123 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 5 | -78/+47 | |
| | * | | | | | | | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 3 | -34/+56 | |
| | * | | | | | | | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 3 | -32/+22 | |
| * | | | | | | | | Merge pull request #3638 from matrix-org/rav/refactor_federation_client_excep... | Richard van der Hoff | 2018-08-02 | 1 | -129/+148 | |
| |\| | | | | | | | ||||||
| | * | | | | | | | Factor out exception handling in federation_client | Richard van der Hoff | 2018-08-01 | 1 | -129/+148 | |
| * | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 9 | -19/+65 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge tag 'v0.33.1' | Richard van der Hoff | 2018-08-02 | 8 | -19/+63 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Prepare 0.33.1 | Richard van der Hoff | 2018-08-02 | 1 | -1/+1 | |
| | | * | | | | | | | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 3 | -6/+23 | |
| | | * | | | | | | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 3 | -62/+26 | |
| | | * | | | | | | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 3 | -1/+64 | |
| | * | | | | | | | | | Merge pull request #3377 from Valodim/note-affinity | Richard van der Hoff | 2018-07-19 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | add note that the affinity package is required for the cpu_affinity setting | Vincent Breitmoser | 2018-06-09 | 1 | -0/+2 | |
| * | | | | | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 2 | -89/+100 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | update docs | Erik Johnston | 2018-08-01 | 2 | -4/+6 | |
| | * | | | | | | | | | | _persist_auth_tree no longer returns anything | 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 | 26 | -108/+446 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 2 | -85/+94 | |
* | | | | | | | | | | | | | update generate_monthly_active_users, and reap_monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -2/+2 | |
* | | | | | | | | | | | | | 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 | 4 | -19/+29 | |
* | | | | | | | | | | | | | remove unused count_monthly_users | Neil Johnson | 2018-08-02 | 1 | -25/+0 | |
* | | | | | | | | | | | | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 4 | -8/+36 | |
* | | | | | | | | | | | | | 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 | 29 | -236/+282 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 7 | -4/+90 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | count_monthly_users is now async | Neil Johnson | 2018-08-01 | 1 | -1/+2 | |
| | * | | | | | | | | | | | | 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 | 14 | -187/+98 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | count_monthly_users() async | Neil Johnson | 2018-08-01 | 1 | -4/+7 | |
| | * | | | | | | | | | | | | | remove need to plot limit_usage_by_mau | Neil Johnson | 2018-08-01 | 2 | -7/+6 | |
| | * | | | | | | | | | | | | | 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 | 2 | -17/+18 | |
| | * | | | | | | | | | | | | | only need to loop if mau limiting is enabled | Neil Johnson | 2018-08-01 | 1 | -1/+2 | |
| | * | | | | | | | | | | | | | coding style | Neil Johnson | 2018-07-31 | 5 | -6/+10 | |
| | * | | | | | | | | | | | | | remove errant logging | Neil Johnson | 2018-07-30 | 1 | -1/+0 | |
| | * | | | | | | | | | | | | | actually close conn | Neil Johnson | 2018-07-30 | 1 | -4/+8 | |
| | * | | | | | | | | | | | | | factor out metrics from __init__ to app/homeserver | Neil Johnson | 2018-07-30 | 2 | -25/+32 | |
| | * | | | | | | | | | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 5 | -2/+69 | |
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | 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 | 5 | -2/+118 | |
|/ / / / / / / / / / / | ||||||
* | / / / / / / / / / | 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 | |
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |