summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-141-10/+0
|\
| * Update register.pyNeil Johnson2018-08-141-10/+0
* | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-144-17/+35
|\|
| * support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-134-17/+35
* | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...Neil Johnson2018-08-143-8/+26
|\ \
| * | rename _user_last_seen_monthly_activeNeil Johnson2018-08-092-6/+6
| * | fix errant parenthesisNeil Johnson2018-08-091-1/+1
| * | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-092-3/+17
| * | block sync if auth checks failNeil Johnson2018-08-091-7/+5
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-093-0/+9
| |\ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-0921-298/+667
| |\ \ \
| * | | | sync auth blockingNeil Johnson2018-08-081-5/+11
* | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po...Amber Brown2018-08-144-196/+11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-132-196/+1
| |\ \ \ \
| | * | | | Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-102-196/+1
| * | | | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-134-35/+17
| * | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-134-17/+35
| * | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-132-0/+10
* | | | | | fix sqlite/postgres incompatibility in reap_monthly_active_usersNeil Johnson2018-08-111-16/+28
|/ / / / /
* | | | | Merge branch 'rav/fix_linearizer_cancellation' into developRichard van der Hoff2018-08-101-43/+68
|\ \ \ \ \
| * | | | | Fix linearizer cancellation on twisted < 18.7Richard van der Hoff2018-08-101-43/+68
| |/ / / /
* | | | | log *after* reloading log configRichard van der Hoff2018-08-101-2/+1
* | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-1029-31/+31
* | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-1013-16/+110
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | more generic conversion of str/bytes to unicodeJeroen2018-08-091-1/+1
| * | | | include private functions from twistedJeroen2018-08-091-2/+35
| * | | | updated docstring for ServerContextFactoryJeroen2018-08-081-1/+1
| * | | | fix isortJeroen2018-07-291-2/+3
| * | | | fix accidental removal of hsJeroen2018-07-271-1/+1
| * | | | Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-2772-1162/+2278
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_...Jeroen2018-07-14259-1767/+1825
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-0968-191/+791
| |\ \ \ \ \ \
| * | | | | | | take idna implementation from twistedJeroen2018-06-261-2/+2
| * | | | | | | allow self-signed certificatesJeroen2018-06-263-35/+36
| * | | | | | | formatting changes for pep8Jeroen2018-06-254-5/+8
| * | | | | | | send SNI for federation requestsJeroen2018-06-2414-13/+69
* | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-093-0/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | fix pep8 too many linesNeil Johnson2018-08-081-1/+0
| * | | | | | | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-0812-22/+240
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-083-6/+54
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hsNeil Johnson2018-08-084-37/+69
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-061-4/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-061-4/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-062-8/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | disable HS from configNeil Johnson2018-08-043-0/+9
* | | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-08-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | 0.33.2Amber Brown2018-08-091-1/+1
| * | | | | | | | | | | | fix for rc1 v0.33.2rc1Amber Brown2018-08-071-1/+1
| * | | | | | | | | | | | versionAmber Brown2018-08-071-1/+1
* | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servletErik Johnston2018-08-095-274/+395
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixup wording and remove dead codeErik Johnston2018-08-091-2/+1
| * | | | | | | | | | | | | Rename POST param to METHODErik Johnston2018-08-082-13/+22
| * | | | | | | | | | | | | Fixup logging and docstringsErik Johnston2018-08-082-2/+40
| * | | | | | | | | | | | | Fix isortErik Johnston2018-08-061-4/+1
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r...Erik Johnston2018-08-0340-601/+707
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use new helper base class for membership requestsErik Johnston2018-07-312-195/+108
| * | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServletErik Johnston2018-07-312-86/+40
| * | | | | | | | | | | | | | Add helper base class for generating new replication endpointsErik Johnston2018-07-311-0/+208
* | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-083-1/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix metric nameRichard van der Hoff2018-08-071-1/+1
| * | | | | | | | | | | | | | more metrics for the federation and appservice sendersRichard van der Hoff2018-08-073-1/+32
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-0812-22/+239
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't expose default_room_version as config optRichard van der Hoff2018-08-073-15/+5
| * | | | | | | | | | | | | Check m.room.create for sane room_versionsRichard van der Hoff2018-08-062-4/+32
| * | | | | | | | | | | | | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-064-8/+25
| * | | | | | | | | | | | | sanity check response from make_joinRichard van der Hoff2018-08-031-1/+3
| * | | | | | | | | | | | | Enforce compatibility when processing make_join requestsRichard van der Hoff2018-08-033-4/+63
| * | | | | | | | | | | | | Basic support for room versioningRichard van der Hoff2018-08-036-5/+79
| * | | | | | | | | | | | | Docstrings for BaseFederationServletRichard van der Hoff2018-08-031-0/+47
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u...Neil Johnson2018-08-084-36/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-0810-53/+220
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | typosNeil Johnson2018-08-082-3/+3
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metricRichard van der Hoff2018-08-071-3/+8
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-031-31/+58
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | prevent total number of reserved users being too largeNeil Johnson2018-08-071-1/+3
* | | | | | | | | | | implement reserved users for mau limitsNeil Johnson2018-08-073-12/+41
* | | | | | | | | | | WIP building out mau reserved usersNeil Johnson2018-08-061-1/+15
* | | | | | | | | | | load mau limit threepidsNeil Johnson2018-08-061-0/+3
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix postgres compatibility bugNeil Johnson2018-08-061-4/+15
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | update comments to reflect new sigNeil Johnson2018-08-061-4/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | make use of _simple_select_one_onecol, improved commentsNeil Johnson2018-08-062-8/+15
| |_|/ / / / / |/| | | | | |
* | | | | | | py3 fixNeil Johnson2018-08-031-1/+1
* | | | | | | bug fixesNeil Johnson2018-08-033-19/+7
* | | | | | | wip commit - tests failingNeil Johnson2018-08-033-40/+53
* | | | | | | fix (lots of) py3 test failuresNeil Johnson2018-08-031-2/+2
* | | | | | | fix caching and testsNeil Johnson2018-08-032-49/+43
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0318-376/+433
|\| | | | | |
| * | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-028-142/+123
| |\ \ \ \ \ \
| | * | | | | | Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-015-78/+47
| | * | | | | | Refactor code for turning HttpResponseException into SynapseErrorRichard van der Hoff2018-08-013-34/+56
| | * | | | | | Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-013-32/+22
| * | | | | | | Merge pull request #3638 from matrix-org/rav/refactor_federation_client_excep...Richard van der Hoff2018-08-021-129/+148
| |\| | | | | |
| | * | | | | | Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
| * | | | | | | Merge branch 'master' into developRichard van der Hoff2018-08-029-19/+65
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'v0.33.1'Richard van der Hoff2018-08-028-19/+63
| | |\ \ \ \ \ \ \
| | | * | | | | | | Prepare 0.33.1Richard van der Hoff2018-08-021-1/+1
| | | * | | | | | | Check room visibility for /event/ requestsRichard van der Hoff2018-08-023-6/+23
| | | * | | | | | | Avoid extra db lookupsRichard van der Hoff2018-08-023-62/+26
| | | * | | | | | | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-023-1/+64
| | * | | | | | | | Merge pull request #3377 from Valodim/note-affinityRichard van der Hoff2018-07-191-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | add note that the affinity package is required for the cpu_affinity settingVincent Breitmoser2018-06-091-0/+2
| * | | | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-022-89/+100
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | update docsErik Johnston2018-08-012-4/+6
| | * | | | | | | | | _persist_auth_tree no longer returns anythingErik Johnston2018-08-011-1/+1
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_...Erik Johnston2018-07-3026-108/+446
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Split out DB writes in federation handlerErik Johnston2018-07-252-85/+94
* | | | | | | | | | | | update generate_monthly_active_users, and reap_monthly_active_usersNeil Johnson2018-08-021-2/+2
* | | | | | | | | | | | typoNeil Johnson2018-08-021-1/+1
* | | | | | | | | | | | wip attempt at cachingNeil Johnson2018-08-021-9/+47
* | | | | | | | | | | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-024-19/+29
* | | | | | | | | | | | remove unused count_monthly_usersNeil Johnson2018-08-021-25/+0
* | | | | | | | | | | | insertion into monthly_active_usersNeil Johnson2018-08-024-8/+36
* | | | | | | | | | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-022-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | self.db_conn unusedNeil Johnson2018-08-011-1/+0
| * | | | | | | | | | | | normalise reaping queryNeil Johnson2018-08-011-3/+38
* | | | | | | | | | | | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-022-4/+10
|/ / / / / / / / / / / /
* | | | | | | | | | | | change monthly_active_users table to be a single columnNeil Johnson2018-08-012-10/+4
* | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0129-236/+282
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-017-4/+90
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | count_monthly_users is now asyncNeil Johnson2018-08-011-1/+2
| | * | | | | | | | | | | improve clarityNeil Johnson2018-08-011-4/+5
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-0114-187/+98
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | count_monthly_users() asyncNeil Johnson2018-08-011-4/+7
| | * | | | | | | | | | | | remove need to plot limit_usage_by_mauNeil Johnson2018-08-012-7/+6
| | * | | | | | | | | | | | remove errant printNeil Johnson2018-08-011-1/+0
| | * | | | | | | | | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-012-17/+18
| | * | | | | | | | | | | | only need to loop if mau limiting is enabledNeil Johnson2018-08-011-1/+2
| | * | | | | | | | | | | | coding styleNeil Johnson2018-07-315-6/+10
| | * | | | | | | | | | | | remove errant loggingNeil Johnson2018-07-301-1/+0
| | * | | | | | | | | | | | actually close connNeil Johnson2018-07-301-4/+8
| | * | | | | | | | | | | | factor out metrics from __init__ to app/homeserverNeil Johnson2018-07-302-25/+32
| | * | | | | | | | | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-305-2/+69
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-foundRichard van der Hoff2018-08-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | return NotFoundError if room not foundSerban Constantin2018-07-311-2/+2
| * | | | | | | | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-0214-48/+96
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layerRichard van der Hoff2018-08-011-14/+14
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | rename replication_layer to federation_clientRichard van der Hoff2018-07-311-14/+14
| * | | | | | | | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decoratorRichard van der Hoff2018-08-011-67/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | fix invalidationRichard van der Hoff2018-07-271-1/+1
| | * | | | | | | | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-271-67/+64
| * | | | | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failuresTravis Ralston2018-07-315-96/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Remove pdu_failures from transactionsTravis Ralston2018-07-305-96/+7
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchyRichard van der Hoff2018-07-316-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | reinstate explicit include of EventsWorkerStoreRichard van der Hoff2018-07-311-1/+3
| | * | | | | | | | | | Make EventStore inherit from EventFederationStoreRichard van der Hoff2018-07-266-7/+9
* | | | | | | | | | | | clean upNeil Johnson2018-08-011-15/+3
* | | | | | | | | | | | fix commentNeil Johnson2018-08-011-1/+1
* | | | | | | | | | | | api into monthly_active_users tableNeil Johnson2018-07-315-2/+118
|/ / / / / / / / / / /
* | / / / / / / / / / Only import secrets when availableKrombel2018-07-301-4/+3
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-274-7/+42
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pidRichard van der Hoff2018-07-271-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_...Michael Telatynski2018-07-24332-10409/+26535
| |\ \ \ \ \ \ \ \
| * | | | | | | | | if inviter_display_name == ""||None then default to inviter MXIDMichael Telatynski2018-06-131-0/+4
* | | | | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leaveRichard van der Hoff2018-07-261-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update the send_leave path to be an event_idTravis Ralston2018-07-261-2/+2
* | | | | | | | | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_contentRichard van der Hoff2018-07-263-2/+98
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Create the column nullableRichard van der Hoff2018-07-262-9/+13
| * | | | | | | | | | | Stop populating events.contentRichard van der Hoff2018-07-262-1/+93
* | | | | | | | | | | | Deduplicate redundant lazy-loaded members (#3331)Matthew Hodgson2018-07-262-25/+71
* | | | | | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-262-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove some redundant joins on event_edges.room_idRichard van der Hoff2018-07-262-8/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #3610 from matrix-org/rav/fix_looping_callsRichard van der Hoff2018-07-2612-15/+23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-2612-15/+23
| | |_|/ / / / / / / | |/| | | | | | | |
* / | | | | | | | | comment on event_edgesRichard van der Hoff2018-07-261-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-263-62/+212
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | switch missing_types to be a boolMatthew Hodgson2018-07-251-4/+4
| * | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2523-231/+349
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | incorporate more review.Matthew Hodgson2018-07-251-16/+14
| * | | | | | | | | handle the edge case for _get_some_state_from_cache where types is []Matthew Hodgson2018-07-241-1/+7
| * | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-241-12/+4
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | clarify comment on p_idsMatthew Hodgson2018-07-241-1/+2
| * | | | | | | | | | consider non-filter_type types as wildcards, thus missing from the state-grou...Matthew Hodgson2018-07-241-1/+4
| * | | | | | | | | | rather than adding ll_ids, remove them from p_idsMatthew Hodgson2018-07-241-5/+6
| * | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2413-316/+409
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | incorporate more reviewMatthew Hodgson2018-07-242-30/+18
| * | | | | | | | | | | handle case where types is [] on postgres correctlyMatthew Hodgson2018-07-231-1/+1
| * | | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2325-274/+646
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | incorporate reviewMatthew Hodgson2018-07-232-52/+35
| * | | | | | | | | | | | fix thinkos; unbreak testsMatthew Hodgson2018-07-191-2/+2
| * | | | | | | | | | | | incorporate reviewMatthew Hodgson2018-07-192-20/+31
| * | | | | | | | | | | | add a filtered_types param to limit filtering to specific typesMatthew Hodgson2018-07-192-82/+96
| * | | | | | | | | | | | merge develop pydoc for _get_state_for_groupsMatthew Hodgson2018-07-19271-2455/+3532
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-1020-124/+176
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0454-166/+398
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | more commentsMatthew Hodgson2018-06-041-0/+7
| * | | | | | | | | | | | | | | add lazy_load_members to the filter json schemaMatthew Hodgson2018-05-291-1/+4
| * | | | | | | | | | | | | | | pep8Matthew Hodgson2018-05-291-0/+1
| * | | | | | | | | | | | | | | disable CPUMetrics if no /proc/self/statMatthew Hodgson2018-05-291-0/+3
| * | | | | | | | | | | | | | | add pydocMatthew Hodgson2018-05-292-27/+67
| * | | | | | | | | | | | | | | merge developMatthew Hodgson2018-05-29186-2989/+5608
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | make lazy_load_members configurable in filtersMatthew Hodgson2018-03-192-9/+15
| * | | | | | | | | | | | | | | | reshuffle todo & commentsMatthew Hodgson2018-03-191-2/+10
| * | | | | | | | | | | | | | | | only get member state IDs for incremental syncs if we're filteringMatthew Hodgson2018-03-181-5/+5
| * | | | | | | | | | | | | | | | remove stale importMatthew Hodgson2018-03-161-1/+0
| * | | | | | | | | | | | | | | | remove debugMatthew Hodgson2018-03-161-4/+0
| * | | | | | | | | | | | | | | | fix tsm search againMatthew Hodgson2018-03-161-5/+4
| * | | | | | | | | | | | | | | | add state_ids for timeline entriesMatthew Hodgson2018-03-161-4/+14
| * | | | | | | | | | | | | | | | simplify timeline_start_membersMatthew Hodgson2018-03-161-14/+13
| * | | | | | | | | | | | | | | | Replace some ujson with simplejson to make it workErik Johnston2018-03-164-4/+5
| * | | | | | | | | | | | | | | | make incr syncs workMatthew Hodgson2018-03-161-3/+4
| * | | | | | | | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-03-1410-144/+711
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | pep8Matthew Hodgson2018-03-141-2/+2
| * | | | | | | | | | | | | | | | | add copyright to nudge CIMatthew Hodgson2018-03-141-1/+2
| * | | | | | | | | | | | | | | | | oopsMatthew Hodgson2018-03-131-1/+1
| * | | | | | | | | | | | | | | | | make it workMatthew Hodgson2018-03-132-7/+9
| * | | | | | | | | | | | | | | | | remove comment now #2969 is fixedMatthew Hodgson2018-03-131-6/+0
| * | | | | | | | | | | | | | | | | merge proper fix to bug 2969Matthew Hodgson2018-03-1334-301/+515
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | typoeMatthew Hodgson2018-03-131-1/+1
| | * | | | | | | | | | | | | | | | | disable optimisation for searching for state groupsMatthew Hodgson2018-03-131-3/+13
| | * | | | | | | | | | | | | | | | | build where_clause sanelyMatthew Hodgson2018-03-131-6/+4
| | * | | | | | | | | | | | | | | | | PR feedbackzMatthew Hodgson2018-03-131-3/+2
| | * | | | | | | | | | | | | | | | | fix bug #2926Matthew Hodgson2018-03-131-4/+17
| * | | | | | | | | | | | | | | | | | ensure we always include the members for a given timeline blockMatthew Hodgson2018-03-131-4/+32
| * | | | | | | | | | | | | | | | | | correctly handle None state_keysMatthew Hodgson2018-03-121-10/+16
| * | | | | | | | | | | | | | | | | | fix sqlite where clauseMatthew Hodgson2018-03-121-2/+3
| * | | | | | | | | | | | | | | | | | typosMatthew Hodgson2018-03-112-2/+4
| * | | | | | | | | | | | | | | | | | WIP experiment in lazyloading room membersMatthew Hodgson2018-03-112-17/+73
* | | | | | | | | | | | | | | | | | | Fix a minor documentation typo in on_make_leaveTravis Ralston2018-07-251-1/+1
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #3603 from matrix-org/erikj/handle_outliersErik Johnston2018-07-251-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Actually fix it by adding continueErik Johnston2018-07-251-0/+1
| * | | | | | | | | | | | | | | | | | Fix typo in conditionalErik Johnston2018-07-251-1/+1
| * | | | | | | | | | | | | | | | | | Correctly handle outliers during persist eventsErik Johnston2018-07-251-6/+7
* | | | | | | | | | | | | | | | | | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_moreRichard van der Hoff2018-07-252-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix another logcontext leak in _persist_eventsRichard van der Hoff2018-07-252-5/+10
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_errorRichard van der Hoff2018-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix occasional 'tuple index out of range' errorRichard van der Hoff2018-07-251-1/+1
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cacheRichard van der Hoff2018-07-251-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix updating of cached remote profilesRichard van der Hoff2018-07-251-1/+8
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Fix unit testsRichard van der Hoff2018-07-251-1/+1
* | | | | | | | | | | | | | | | | | | Wrap a number of things that run in the backgroundRichard van der Hoff2018-07-259-22/+63
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.STARTErik Johnston2018-07-242-5/+9
* | | | | | | | | | | | | | | | | | Pull out did_forget to worker storeErik Johnston2018-07-242-29/+28
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3595 from matrix-org/erikj/use_deltasErik Johnston2018-07-241-53/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Expand on docstring comment about return valueErik Johnston2018-07-241-0/+5
| * | | | | | | | | | | | | | | | | Remove unnecessary iteritemsErik Johnston2018-07-241-1/+1
| * | | | | | | | | | | | | | | | | Fixup comment (and indent)Erik Johnston2018-07-241-16/+20
| * | | | | | | | | | | | | | | | | Don't fetch state from the database unless neededErik Johnston2018-07-241-12/+18
| * | | | | | | | | | | | | | | | | Have _get_new_state_after_events return deltaErik Johnston2018-07-241-17/+48
| * | | | | | | | | | | | | | | | | Don't require to_delete to have event_idsErik Johnston2018-07-241-36/+55
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3587 from matrix-org/rav/better_exception_loggingRichard van der Hoff2018-07-241-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Improve logging for exceptions handling PDUsRichard van der Hoff2018-07-231-3/+8
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groupsRichard van der Hoff2018-07-243-62/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_eventsRichard van der Hoff2018-07-232-8/+8
| * | | | | | | | | | | | | | | | | Fixes and optimisations for resolve_state_groupsRichard van der Hoff2018-07-231-54/+89
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-243-46/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2414-317/+429
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-2319-179/+400
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Remove redundant checks on room forgottennessRichard van der Hoff2018-07-233-46/+1
* | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c...Erik Johnston2018-07-2413-315/+408
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-2410-295/+380
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-01 03:35:00 +0000