summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-0998-405/+819
|\
| * Merge branch 'master' into developAmber Brown2018-08-0961-56/+75
| |\
| | * 0.33.2 changelog v0.33.2 github/release-v0.33.2 release-v0.33.2Amber Brown2018-08-091-0/+6
| | * 0.33.2Amber Brown2018-08-091-1/+1
| | * fix the changelog & templateAmber Brown2018-08-092-50/+50
| | * fix changelogAmber Brown2018-08-071-1/+4
| | * fix for rc1 v0.33.2rc1Amber Brown2018-08-072-3/+3
| | * changelogAmber Brown2018-08-0759-54/+64
| | * versionAmber Brown2018-08-071-1/+1
| * | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servletErik Johnston2018-08-096-274/+396
| |\ \
| | * | Fixup wording and remove dead codeErik Johnston2018-08-092-2/+2
| | * | 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-0367-647/+1073
| | |\ \
| | * | | NewsfileErik Johnston2018-07-311-0/+0
| | * | | 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
| * | | | Test fixes for Python 3 (#3647)Amber Brown2018-08-0914-52/+71
| * | | | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-084-1/+33
| |\ \ \ \
| | * | | | changelogRichard van der Hoff2018-08-071-0/+1
| | * | | | 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-0814-22/+244
| |\ \ \ \
| | * | | | Don't expose default_room_version as config optRichard van der Hoff2018-08-073-15/+5
| | * | | | changelogRichard van der Hoff2018-08-061-0/+1
| | * | | | 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-037-5/+83
| | * | | | Docstrings for BaseFederationServletRichard van der Hoff2018-08-031-0/+47
| | | |_|/ | | |/| |
* | / | | sync auth blockingNeil Johnson2018-08-082-5/+53
|/ / / /
* | | | Merge pull request #3662 from matrix-org/neilj/reserved_usersNeil Johnson2018-08-086-7/+115
|\ \ \ \
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u...Neil Johnson2018-08-0816-156/+225
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-0818-163/+414
|\ \ \ \ \
| * | | | | typosNeil Johnson2018-08-082-3/+3
* | | | | | Merge pull request #3658 from matrix-org/rav/fix_event_persisted_position_met...Richard van der Hoff2018-08-072-3/+9
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-08-071-0/+1
| * | | | | | Fix occasional glitches in the synapse_event_persisted_position metricRichard van der Hoff2018-08-071-3/+8
| | |_|_|/ / | |/| | | |
* / | | | | fix event lag graphRichard van der Hoff2018-08-071-8/+16
|/ / / / /
* | | | | Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-032-31/+59
* | | | | Merge pull request #3644 from matrix-org/michaelkaye/refactor_docker_location...Michael Kaye2018-08-039-112/+139
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update README.mdMichael Kaye2018-08-031-1/+1
| * | | | Update README.mdMichael Kaye2018-08-031-1/+1
| * | | | Update README.rstMichael Kaye2018-08-031-1/+1
| * | | | Update README.rstMichael Kaye2018-08-031-3/+10
| * | | | Add news entryMichael Kaye2018-08-021-0/+1
| * | | | Address SPAG issuesMichael Kaye2018-08-021-2/+4
| * | | | Do not include docker files in python buildMichael Kaye2018-08-021-0/+1
| * | | | Refactor docker locations and README.Michael Kaye2018-08-027-110/+126
| | | * | Ability to whitelist specific threepids against monthly active user limitingNeil Johnson2018-08-081-0/+1
| | | * | mock config.max_mau_valueNeil Johnson2018-08-081-0/+1
| | | * | prevent total number of reserved users being too largeNeil Johnson2018-08-071-1/+3
| | | * | implement reserved users for mau limitsNeil Johnson2018-08-074-13/+99
| | | * | WIP building out mau reserved usersNeil Johnson2018-08-061-1/+15
| | | * | add default mau_limits_reserved_threepidsNeil Johnson2018-08-061-0/+1
| | | * | 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
| | * | remove unused importNeil Johnson2018-08-031-1/+1
| | * | bug fixesNeil Johnson2018-08-035-27/+10
| | * | wip commit - tests failingNeil Johnson2018-08-035-53/+66
| | * | fix (lots of) py3 test failuresNeil Johnson2018-08-033-3/+3
| | * | fix py3 test failureNeil Johnson2018-08-031-0/+1
| | * | Add ability to limit number of monthly active users on the serverNeil Johnson2018-08-031-0/+1
| | * | fix caching and testsNeil Johnson2018-08-033-62/+80
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0325-379/+450
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragmentAmber Brown2018-08-032-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | newsfragmentMichael Kaye2018-08-021-0/+1
| * | | Mention the word "newsfragment" in CONTRIBUTING.rstMichael Kaye2018-08-021-1/+1
|/ / /
* | | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-029-142/+124
|\ \ \
| * | | changelogRichard van der Hoff2018-08-011-0/+1
| * | | 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-022-129/+149
|\ \ \ \
| * | | | changelogRichard van der Hoff2018-08-011-0/+1
| |/ / /
| * | | Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
* | | | Merge branch 'master' into developRichard van der Hoff2018-08-0211-21/+77
|\ \ \ \
| * \ \ \ Merge tag 'v0.33.1'Richard van der Hoff2018-08-029-19/+73
| |\ \ \ \
| | * | | | changelog: this is a security release v0.33.1 github/release-v0.33.1 release-v0.33.1Richard van der Hoff2018-08-021-2/+2
| | * | | | fix changelog typosRichard van der Hoff2018-08-021-1/+1
| | * | | | Prepare 0.33.1Richard van der Hoff2018-08-024-3/+11
| | * | | | Merge pull request #3642 from matrix-org/rav/another_room_id_checkRichard van der Hoff2018-08-025-7/+25
| | |\ \ \ \
| | | * | | | changelogsRichard van der Hoff2018-08-022-1/+2
| | | * | | | Check room visibility for /event/ requestsRichard van der Hoff2018-08-023-6/+23
| | * | | | | Merge pull request #3641 from matrix-org/rav/room_id_checkRichard van der Hoff2018-08-025-12/+40
| | |\| | | |
| | | * | | | changelogRichard van der Hoff2018-08-021-0/+1
| | | * | | | 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 #3594 from matrix-org/richvdh-patch-1Richard van der Hoff2018-07-241-2/+3
| |\ \ \ \ \
| | * | | | | Update ISSUE_TEMPLATE.mdRichard van der Hoff2018-07-241-2/+3
| |/ / / / /
| * | | | | 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-023-89/+101
|\ \ \ \ \ \
| * | | | | | 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-3037-108/+787
| |\ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2018-07-271-0/+1
| * | | | | | | 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-027-61/+97
| | | | | | * | remove unused count_monthly_usersNeil Johnson2018-08-022-90/+0
| | | | | | * | fix test, update constructor callNeil Johnson2018-08-021-1/+1
| | | | | | * | insertion into monthly_active_usersNeil Johnson2018-08-025-11/+99
| | | | | | * | 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-023-7/+13
| | | | | | |/ /
| | | | | | * | change monthly_active_users table to be a single columnNeil Johnson2018-08-013-13/+7
| | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0148-279/+625
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-0111-16/+275
|\ \ \ \ \ \ \ \
| * | | | | | | | count_monthly_users is now asyncNeil Johnson2018-08-011-1/+2
| * | | | | | | | improve clarityNeil Johnson2018-08-012-5/+6
| * | | | | | | | fix isortNeil Johnson2018-08-011-1/+0
| * | | | | | | | fix test for py3Neil Johnson2018-08-011-0/+4
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-0127-198/+5193
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix known broken testNeil Johnson2018-08-011-25/+20
| * | | | | | | | | 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-014-38/+46
| * | | | | | | | | only need to loop if mau limiting is enabledNeil Johnson2018-08-011-1/+2
| * | | | | | | | | mau limtsNeil Johnson2018-07-311-0/+1
| * | | | | | | | | coding styleNeil Johnson2018-07-317-9/+12
| * | | | | | | | | fix user_ips countingNeil Johnson2018-07-311-9/+33
| * | | | | | | | | remove errant loggingNeil Johnson2018-07-301-1/+0
| * | | | | | | | | actually close connNeil Johnson2018-07-301-4/+8
| * | | | | | | | | monthly_active_testsNeil Johnson2018-07-301-0/+48
| * | | | | | | | | 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-307-3/+166
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-foundRichard van der Hoff2018-08-013-3/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Update 2952.bugfixRichard van der Hoff2018-08-011-1/+1
| * | | | | | | | return NotFoundError if room not foundSerban Constantin2018-07-313-3/+7
* | | | | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-0217-67/+122
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3543 from bebehei/dockerJan Christian Grünhage2018-08-014-10/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | [Docker] Use sorted multiline package listsBenedikt Heine2018-07-192-3/+20
| * | | | | | | | [Docker] Build docker image via composeBenedikt Heine2018-07-172-7/+2
* | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layerRichard van der Hoff2018-08-012-14/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | changelogRichard van der Hoff2018-07-311-0/+1
| * | | | | | | | | 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-013-67/+166
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix invalidationRichard van der Hoff2018-07-272-2/+42
| * | | | | | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-273-67/+126
* | | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failuresTravis Ralston2018-07-317-97/+8
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove pdu_failures from transactionsTravis Ralston2018-07-307-97/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchyRichard van der Hoff2018-07-317-6/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reinstate explicit include of EventsWorkerStoreRichard van der Hoff2018-07-311-1/+3
| * | | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| * | | | | | | | | 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-316-2/+160
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge pull request #3629 from ptman/patch-1Richard van der Hoff2018-07-311-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add some documentation for using the dashboardPaul Tötterman2018-07-311-0/+6
|/ / / / / / / /
* | | | | | | | synapse grafana dashboardRichard van der Hoff2018-07-311-0/+4961
* | | | | | | | Merge pull request #3626 from krombel/only_import_secrets_when_availableAmber Brown2018-07-312-4/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Only import secrets when availableKrombel2018-07-302-4/+4
|/ / / / / / /
* | / / / / / make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-275-7/+43
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pidRichard van der Hoff2018-07-272-0/+5
|\ \ \ \ \ \
| * | | | | | add changelog entry for PR#3391Michael Telatynski2018-07-241-0/+1
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into t3chguy/default_...Michael Telatynski2018-07-24506-14810/+36527
| |\ \ \ \ \ \
| * | | | | | | if inviter_display_name == ""||None then default to inviter MXIDMichael Telatynski2018-06-131-0/+4
* | | | | | | | Merge pull request #3469 from DJViking/masterRichard van der Hoff2018-07-271-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add instructions for install on OpenSUSE and SLESSverre Moe2018-07-011-0/+13
* | | | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leaveRichard van der Hoff2018-07-262-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Create 3616.miscTravis Ralston2018-07-261-0/+1
| * | | | | | | | | 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-264-2/+99
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| * | | | | | | | | | 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-263-25/+72
* | | | | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-263-8/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| * | | | | | | | | | 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-2613-15/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-2613-15/+24
| | |_|_|/ / / / / | |/| | | | | | |
* / | | | | | | | comment on event_edgesRichard van der Hoff2018-07-261-1/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-265-62/+532
|\ \ \ \ \ \ \ \
| * | | | | | | | switch missing_types to be a boolMatthew Hodgson2018-07-251-4/+4
| * | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2534-238/+389
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | flake8Matthew Hodgson2018-07-251-12/+12
| * | | | | | | | add tests for _get_some_state_from_cacheMatthew Hodgson2018-07-251-0/+150
| * | | | | | | | 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-242-12/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-2417-316/+416
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | incorporate more reviewMatthew Hodgson2018-07-243-30/+27
| * | | | | | | | | | handle case where types is [] on postgres correctlyMatthew Hodgson2018-07-231-1/+1
| * | | | | | | | | | changelogMatthew Hodgson2018-07-231-0/+1
| * | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2353-3241/+3681
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | incorporate reviewMatthew Hodgson2018-07-232-52/+35
| * | | | | | | | | | | make test workMatthew Hodgson2018-07-191-37/+46
| * | | | | | | | | | | first cut of a UT for testing state store (untested)Matthew Hodgson2018-07-191-0/+151
| * | | | | | | | | | | 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-19370-3768/+6264
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-1028-178/+531
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0459-181/+496
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | fix dumb typoMatthew Hodgson2018-05-291-4/+4
| * | | | | | | | | | | | | | add pydocMatthew Hodgson2018-05-292-27/+67
| * | | | | | | | | | | | | | merge developMatthew Hodgson2018-05-29242-3342/+7386
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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-1346-336/+576
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | Merge pull request #3609 from matrix-org/travis/doc-typo-2Travis Ralston2018-07-252-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Create 3609.miscTravis Ralston2018-07-251-0/+1
| * | | | | | | | | | | | | | | | | 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-252-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Actually fix it by adding continueErik Johnston2018-07-251-0/+1
| * | | | | | | | | | | | | | | | | Fix typo in conditionalErik Johnston2018-07-251-1/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-27 10:59:16 +0000