summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Clean up work_mem handlingRichard van der Hoff2018-02-031-11/+41
* Move store_event_search_txn to SearchStoreRichard van der Hoff2018-02-032-37/+43
* Merge branch 'develop' into matthew/gin_work_memRichard van der Hoff2018-02-0372-902/+2203
|\
| * Merge pull request #2837 from matrix-org/rav/fix_quarantine_mediaRichard van der Hoff2018-02-011-1/+1
| |\
| | * Fix sql error in quarantine_mediaRichard van der Hoff2018-01-301-1/+1
| * | Merge pull request #2838 from matrix-org/rav/fix_logging_on_dns_failRichard van der Hoff2018-01-311-2/+1
| |\ \
| | * | Remove spurious log argumentRichard van der Hoff2018-01-301-2/+1
| | |/
| * | Merge pull request #2835 from matrix-org/rav/remove_event_type_paramRichard van der Hoff2018-01-311-6/+14
| |\ \
| | * | docstring for get_current_state_idsRichard van der Hoff2018-01-291-0/+13
| | * | Remove unused "event_type" param on state.get_current_state_idsRichard van der Hoff2018-01-291-6/+1
| | |/
| * | Merge pull request #2834 from matrix-org/rav/better_persist_event_exception_h...Richard van der Hoff2018-01-311-3/+3
| |\ \
| | * | Improve exception handling in persist_eventRichard van der Hoff2018-01-291-3/+3
| | |/
| * | Merge pull request #2833 from matrix-org/rav/pusher_hacksRichard van der Hoff2018-01-311-7/+30
| |\ \
| | * | Better logging when pushes failRichard van der Hoff2018-01-291-2/+8
| | * | add appid/device_display_name to to pusher loggingRichard van der Hoff2018-01-291-2/+2
| | * | Fix logging and add user_idRichard van der Hoff2018-01-221-2/+3
| | * | logging and debug for http pusherRichard van der Hoff2018-01-221-4/+20
| * | | Merge pull request #2817 from matrix-org/rav/http_conn_poolRichard van der Hoff2018-01-311-1/+13
| |\ \ \ | | |_|/ | |/| |
| | * | Increase http conn pool sizeRichard van der Hoff2018-01-291-1/+6
| | |/
| | * Use a connection pool for the SimpleHttpClientRichard van der Hoff2018-01-201-1/+8
| * | Fix SQL for user searchRichard van der Hoff2018-01-271-7/+7
| * | Merge pull request #2830 from matrix-org/rav/factor_out_get_connRichard van der Hoff2018-01-2711-130/+17
| |\ \
| | * | Factor out get_db_conn to HomeServer base classRichard van der Hoff2018-01-2611-130/+17
| * | | Merge pull request #2827 from matrix-org/fix_server_500_on_public_rooms_call_...Neil Johnson2018-01-261-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | add white space lineNeil Johnson2018-01-261-0/+1
| | * | rather than try reconstruct the results object, better to guard against the x...Neil Johnson2018-01-261-6/+2
| | * | fix return type, should be a dictNeil Johnson2018-01-251-1/+1
| | * | fix PEP8 violationNeil Johnson2018-01-251-1/+1
| | * | remove white spaceNeil Johnson2018-01-251-1/+0
| | * | synapse 500s on a call to publicRooms in the case where the number of public ...Neil Johnson2018-01-251-0/+5
| * | | fix thinko on 3pid whitelistingMatthew Hodgson2018-01-241-2/+2
| * | | Merge pull request #2816 from matrix-org/rav/metrics_commentsRichard van der Hoff2018-01-231-1/+6
| |\ \ \
| | * | | Add some comments about the reactor tick time metricRichard van der Hoff2018-01-191-1/+6
| * | | | add ?ts massaging for ASes (#2754)Matthew Hodgson2018-01-231-6/+11
| | |/ / | |/| |
| * | | Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-2213-7/+145
| * | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pidMatthew Hodgson2018-01-227-23/+177
| |\ \ \ | | |/ / | |/| |
| | * | fix typo (thanks sytest)Matthew Hodgson2018-01-191-1/+1
| | * | oops, check all login typesMatthew Hodgson2018-01-191-14/+11
| | * | fix PR nitpickingMatthew Hodgson2018-01-191-3/+6
| | * | trailing commasMatthew Hodgson2018-01-192-7/+7
| | * | rewrite based on PR feedback:Matthew Hodgson2018-01-197-89/+102
| | * | fix up v1, and improve errorsMatthew Hodgson2018-01-194-20/+65
| | * | fix pep8Matthew Hodgson2018-01-191-2/+1
| | * | add registrations_require_3pidMatthew Hodgson2018-01-195-13/+110
| * | | Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbsRichard van der Hoff2018-01-191-0/+8
| |\ \ \
| | * | | Use the right path for url_preview thumbnailsRichard van der Hoff2018-01-191-0/+8
| | | |/ | | |/|
| * | | Fix storage provider bug introduced when renamed to store_localErik Johnston2018-01-181-1/+1
| * | | Merge pull request #2812 from matrix-org/erikj/media_storage_provider_configErik Johnston2018-01-183-33/+101
| |\ \ \
| | * | | Fix passing wrong config to provider constructorErik Johnston2018-01-181-1/+1
| | * | | Remove duplicate directory testErik Johnston2018-01-181-4/+0
| | * | | Missing staticmethodErik Johnston2018-01-181-0/+1
| | * | | Fixup commentsErik Johnston2018-01-182-3/+7
| | * | | Make storage providers more configurableErik Johnston2018-01-183-31/+98
| * | | | Merge pull request #2804 from matrix-org/erikj/file_consumerErik Johnston2018-01-181-0/+139
| |\ \ \ \
| | * | | | Do logcontexts correctlyErik Johnston2018-01-181-2/+2
| | * | | | Move test stuff to testsErik Johnston2018-01-181-25/+1
| | * | | | Make all fields privateErik Johnston2018-01-181-31/+31
| | * | | | Ensure we registerProducer isn't called twiceErik Johnston2018-01-181-0/+3
| | * | | | Fix _notify_empty typoErik Johnston2018-01-181-1/+1
| | * | | | Move definition of paused_producer to __init__Erik Johnston2018-01-181-2/+4
| | * | | | Fix commentsErik Johnston2018-01-181-3/+3
| | * | | | Add decent impl of a FileConsumerErik Johnston2018-01-171-0/+158
| | |/ / /
| * | / / Fix typo in thumbnail resource causing access times to be incorrectErik Johnston2018-01-181-2/+2
| | |/ / | |/| |
| * | | Fix bugs in block metricsRichard van der Hoff2018-01-181-2/+4
| * | | Merge pull request #2809 from matrix-org/rav/metrics_errorsRichard van der Hoff2018-01-181-1/+8
| |\ \ \ | | |_|/ | |/| |
| | * | better exception logging in callbackmetricsRichard van der Hoff2018-01-181-1/+8
| * | | Merge pull request #2805 from matrix-org/rav/log_state_resRichard van der Hoff2018-01-171-0/+6
| |\ \ \ | | |/ / | |/| |
| | * | Log room when doing state resolutionRichard van der Hoff2018-01-171-0/+6
| * | | Merge pull request #2783 from matrix-org/erikj/media_last_accessedErik Johnston2018-01-175-11/+64
| |\ \ \
| | * | | Remove lost commentErik Johnston2018-01-171-3/+0
| | * | | Update last access time when thumbnails are viewedErik Johnston2018-01-171-0/+2
| | * | | Keep track of last access time for local mediaErik Johnston2018-01-174-11/+65
| | | |/ | | |/|
| * | | Merge pull request #2803 from matrix-org/matthew/fix-userdir-sqlMatthew Hodgson2018-01-171-2/+7
| |\ \ \
| | * | | fix SQL when searching all usersMatthew Hodgson2018-01-171-2/+7
| * | | | Split resolve_events into two functionsRichard van der Hoff2018-01-172-20/+29
| |/ / /
| * | | Merge pull request #2795 from matrix-org/rav/track_db_schedulingRichard van der Hoff2018-01-175-4/+43
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/develop' into rav/track_db_schedulingRichard van der Hoff2018-01-175-34/+78
| | |\ \ \
| | * | | | Track DB scheduling delay per-requestRichard van der Hoff2018-01-165-4/+43
| | * | | | Merge branch 'rav/db_txn_time_in_millis' into rav/track_db_schedulingRichard van der Hoff2018-01-164-16/+34
| | |\ \ \ \
| * | \ \ \ \ Merge pull request #2797 from matrix-org/rav/user_id_checkingRichard van der Hoff2018-01-172-8/+19
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Sanity checking for user idsRichard van der Hoff2018-01-172-8/+19
| * | | | | | Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millisRichard van der Hoff2018-01-174-10/+17
| |\ \ \ \ \ \
| | * | | | | | Merge branch 'develop' into rav/db_txn_time_in_millisRichard van der Hoff2018-01-174-25/+69
| | |\| | | | | | | | |_|/ / / | | |/| | | |
| | * | | | | Track db txn time in millisecsRichard van der Hoff2018-01-164-10/+17
| * | | | | | Merge pull request #2796 from matrix-org/rav/fix_closed_connection_errorsRichard van der Hoff2018-01-171-9/+9
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into rav/fix_closed_connection_errorsRichard van der Hoff2018-01-175-32/+87
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Fix 'NoneType' object has no attribute 'writeHeaders'Richard van der Hoff2018-01-161-9/+9
| * | | | | | | Merge branch 'develop' into rav/rework_run_interactionRichard van der Hoff2018-01-175-32/+87
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'origin/develop' into rav/optimise_logging_contextRichard van der Hoff2018-01-174-25/+69
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | Merge pull request #2789 from matrix-org/erikj/fix_thumbnailsErik Johnston2018-01-173-24/+68
| | | |\ \ \
| | | | * | | Add docstringErik Johnston2018-01-171-1/+1
| | | | * | | Use local varsErik Johnston2018-01-161-6/+2
| | | | * | | Change _generate_thumbnails to take media_typeErik Johnston2018-01-162-7/+10
| | | | * | | Move setting of file_id up to callerErik Johnston2018-01-162-13/+14
| | | | * | | Fix typoErik Johnston2018-01-161-7/+10
| | | | * | | Fix up log linesErik Johnston2018-01-162-7/+10
| | | | * | | Correctly use server_name/file_id when generating/fetching remote thumbnailsErik Johnston2018-01-162-5/+8
| | | | * | | Log when we respond with 404Erik Johnston2018-01-162-1/+8
| | | | * | | Fix thumbnailing remote filesErik Johnston2018-01-162-2/+30
| | | * | | | fix typoMatthew Hodgson2018-01-161-1/+1
| | | | |/ / | | | |/| |
| | * / | | Optimise LoggingContext creation and copyingRichard van der Hoff2018-01-161-7/+18
| | |/ / /
| * / / / rework runInteraction in terms of runConnectionRichard van der Hoff2018-01-161-20/+31
| |/ / /
| * | | Merge pull request #2785 from matrix-org/rav/reorganise_metrics_againRichard van der Hoff2018-01-163-39/+151
| |\ \ \
| | * | | Reorganise request and block metricsRichard van der Hoff2018-01-152-25/+84
| | * | | mechanism to render metrics with alternative namesRichard van der Hoff2018-01-151-13/+40
| | * | | Add some comments to metrics classesRichard van der Hoff2018-01-151-1/+27
| * | | | Merge pull request #2790 from matrix-org/rav/preserve_event_logcontext_leakRichard van der Hoff2018-01-161-1/+8
| |\ \ \ \
| | * | | | Fix a logcontext leak in persist_eventsRichard van der Hoff2018-01-161-1/+8
| | |/ / /
| * | | | Merge pull request #2787 from matrix-org/rav/worker_event_countsRichard van der Hoff2018-01-162-0/+11
| |\ \ \ \
| | * | | | Metrics for events processed in appservice and fed senderRichard van der Hoff2018-01-152-0/+11
| | |/ / /
| * | | | Merge pull request #2786 from matrix-org/rav/rdata_metricsRichard van der Hoff2018-01-161-5/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Metrics for number of RDATA commands receivedRichard van der Hoff2018-01-151-5/+14
| | |/ /
| * | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactorErik Johnston2018-01-167-346/+843
| |\ \ \ | | |/ / | |/| |
| | * | Fix up commentsErik Johnston2018-01-122-7/+16
| | * | Correctly reraise exceptionErik Johnston2018-01-121-2/+4
| | * | Make Responder a context managerErik Johnston2018-01-122-9/+10
| | * | Add missing class varErik Johnston2018-01-121-0/+3
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_stor...Erik Johnston2018-01-127-28/+68
| | |\ \
| | * | | Remove unnecessary conditionErik Johnston2018-01-121-4/+1
| | * | | Remove unused variablesErik Johnston2018-01-121-3/+0
| | * | | Make class var localErik Johnston2018-01-121-3/+3
| | * | | CommentsErik Johnston2018-01-123-15/+65
| | * | | Add StorageProvider conceptErik Johnston2018-01-093-9/+162
| | * | | Make PreviewUrlResource use MediaStorageErik Johnston2018-01-092-8/+14
| | * | | Make ThumbnailResource use MediaStorageErik Johnston2018-01-092-48/+68
| | * | | Use MediaStorage for remote mediaErik Johnston2018-01-092-136/+156
| | * | | Use MediaStorage for local filesErik Johnston2018-01-092-119/+73
| | * | | Add MediaStorage classErik Johnston2018-01-091-0/+198
| | * | | Add some helper classesErik Johnston2018-01-091-0/+73
| | * | | Split out add_file_headersErik Johnston2018-01-091-28/+42
| * | | | Make Counter render floatsRichard van der Hoff2018-01-121-3/+10
| | |_|/ | |/| |
| * | | Reinstate media download on thumbnail requestRichard van der Hoff2018-01-121-0/+5
| * | | Merge pull request #2774 from matrix-org/erikj/synctlErik Johnston2018-01-122-5/+31
| |\ \ \ | | |_|/ | |/| |
| | * | Actually make it workErik Johnston2018-01-122-2/+15
| | * | RefactorErik Johnston2018-01-121-9/+4
| | * | When using synctl with workers, don't start the main synapse automaticallyErik Johnston2018-01-111-8/+26
| * | | Merge pull request #2766 from matrix-org/rav/room_eventRichard van der Hoff2018-01-111-3/+26
| |\ \ \ | | |/ / | |/| |
| | * | Add /room/{id}/event/{id} to synapseRichard van der Hoff2018-01-091-3/+26
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-01-111-1/+1
| |\ \ \
| | * | | Bump version and changelog github/release-v0.26.0 release-v0.26.0Erik Johnston2018-01-051-1/+1
| | * | | Bump changelog and versionErik Johnston2017-12-131-1/+1
| * | | | Merge pull request #2773 from matrix-org/erikj/hash_bgErik Johnston2018-01-103-10/+18
| |\ \ \ \
| | * | | | Do bcrypt hashing in a background threadErik Johnston2018-01-103-10/+18
| * | | | | fix order of operations derp and also use `.get` to default to {}Michael Telatynski2018-01-101-2/+3
| * | | | | Fix publicised groups API (singular) over federationMichael Telatynski2018-01-101-4/+4
| * | | | | Merge pull request #2770 from matrix-org/rav/fix_request_metricsRichard van der Hoff2018-01-101-11/+19
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update http request metrics before calling servletRichard van der Hoff2018-01-091-11/+19
| | | |_|/ | | |/| |
| * | | | Remove dead TODOErik Johnston2018-01-091-2/+0
| * | | | Remove dead code related to default thumbnailsErik Johnston2018-01-092-76/+3
| |/ / /
| * | | Merge pull request #2763 from matrix-org/rav/fix_config_utsRichard van der Hoff2018-01-091-2/+2
| |\ \ \
| | * | | Fix broken config UTsRichard van der Hoff2018-01-091-2/+2
| * | | | Make indentation of generated log config consistentRichard van der Hoff2018-01-091-17/+17
| |/ / /
| * | | Fix templating error with unban permission messageTravis Ralston2018-01-071-1/+1
| * | | Remove 'verbosity'/'log_file' from generated cfgRichard van der Hoff2018-01-051-8/+4
| * | | Merge pull request #2744 from matrix-org/rav/login_loggingRichard van der Hoff2018-01-051-4/+10
| |\ \ \
| | * | | Better logging when login can't find a 3pidRichard van der Hoff2017-12-201-4/+10
| * | | | Check missing fields in event_from_pdu_jsonRichard van der Hoff2017-12-301-0/+7
| * | | | Factor out `event_from_pdu_json`Richard van der Hoff2017-12-303-37/+44
| * | | | federation_server: clean up importsRichard van der Hoff2017-12-301-14/+11
| * | | | federation_client: clean up importsRichard van der Hoff2017-12-301-13/+10
| |/ / /
* | | | oopshera2018-01-092-2/+2
* | | | oops, tweak work_mem when actually storingMatthew Hodgson2018-01-091-0/+2
* | | | avoid 80s GIN inserts by tweaking work_memMatthew Hodgson2018-01-091-0/+4
|/ / /
* | | Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typoRichard van der Hoff2017-12-181-2/+2
|\ \ \
| * | | synapse/config/password_auth_providers: Fixed bracket typoRichard von Seck2017-11-161-2/+2
* | | | Implement listen_tcp method in remaining workersSilke2017-12-1810-192/+155
* | | | Remove logger argument and do not catch replication listenerSilke2017-12-182-24/+18
* | | | Add methods for listening on multiple addressesSilke Hofstra2017-12-172-51/+90
* | | | Allow binds to both :: and 0.0.0.0Silke Hofstra2017-12-172-42/+61
* | | | Adapt the default config to bind on IPv6.Willem Mulder2017-12-171-8/+9
| |_|/ |/| |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom...Erik Johnston2017-12-0763-781/+1462
|\ \ \
| * \ \ Merge pull request #2723 from matrix-org/matthew/search-all-local-usersMatthew Hodgson2017-12-0510-36/+221
| |\ \ \
| | * | | fix StoreError syntaxMatthew Hodgson2017-12-051-1/+1
| | * | | speed up the rate of initial spam for usersMatthew Hodgson2017-12-041-11/+12
| | * | | better docMatthew Hodgson2017-12-041-1/+4
| | * | | fix pep8 and testsMatthew Hodgson2017-12-043-8/+6
| | * | | switch to a simpler 'search_all_users' button as per review feedbackMatthew Hodgson2017-12-045-37/+30
| | * | | Merge branch 'develop' into matthew/search-all-local-usersMatthew Hodgson2017-11-3031-179/+497
| | |\ \ \ | | | | |/ | | | |/|
| | * | | specify default user_directory_include_patternMatthew Hodgson2017-11-301-0/+1
| | * | | remove null constraint on user_dir.room_idMatthew Hodgson2017-11-301-0/+35
| | * | | fix alternation operator for FTS4 - how did this ever work!?Matthew Hodgson2017-11-301-1/+1
| | * | | fix thinkos galoreMatthew Hodgson2017-11-303-20/+41
| | * | | kick the user_directory index when new users registerMatthew Hodgson2017-11-291-0/+8
| | * | | untested WIP but might actually workMatthew Hodgson2017-11-296-20/+96
| | * | | Add user_directory_include_pattern config param to expand search results to a...Matthew Hodgson2017-11-295-9/+58
| * | | | Fix error when deleting devicesRichard van der Hoff2017-12-051-1/+1
| * | | | support custom login types for validating usersRichard van der Hoff2017-12-051-24/+57
| * | | | Factor out a validate_user_via_ui_auth methodRichard van der Hoff2017-12-053-74/+102
| * | | | Refactor UI auth implementationRichard van der Hoff2017-12-056-44/+96
| | |/ / | |/| |
| * | | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_commentsRichard van der Hoff2017-11-291-1/+5
| |\ \ \
| | * | | Improve comments on get_user_by_access_tokenRichard van der Hoff2017-11-291-1/+5
| * | | | Delete devices in various logout situationsRichard van der Hoff2017-11-295-5/+75
| * | | | Move set_password into its own handlerRichard van der Hoff2017-11-296-19/+58
| * | | | Move deactivate_account into its own handlerRichard van der Hoff2017-11-296-22/+61
| * | | | Remove pushers when deleting access tokensRichard van der Hoff2017-11-293-18/+32
| * | | | Merge pull request #2718 from matrix-org/rav/notify_logcontextsRichard van der Hoff2017-11-292-9/+18
| |\ \ \ \
| | * | | | Clear logcontext before starting fed txn queue runnerRichard van der Hoff2017-11-282-9/+18
| | |/ / /
| * | | | Merge pull request #2719 from matrix-org/rav/handle_missing_hashesRichard van der Hoff2017-11-291-3/+10
| |\ \ \ \
| | * | | | Fix 500 when joining matrix-devRichard van der Hoff2017-11-291-3/+10
| | |/ / /
| * / / / Allow guest access to group APIs for readingLuke Barnard2017-11-281-11/+11
| |/ / /
| * | | Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_errorRichard van der Hoff2017-11-276-17/+89
| |\ \ \
| | * | | fix sql failsRichard van der Hoff2017-11-221-1/+1
| | * | | Check database in has_completed_background_updatesRichard van der Hoff2017-11-223-12/+33
| | * | | Fix error on sqlite 3.7Richard van der Hoff2017-11-215-8/+59
| | |/ /
| * | | Merge pull request #2713 from matrix-org/rav/no_upsert_foreverRichard van der Hoff2017-11-271-0/+7
| |\ \ \
| | * | | Avoid retrying forever on IntegrityErrorRichard van der Hoff2017-11-271-0/+7
| * | | | Merge pull request #2711 from matrix-org/rav/fix_dns_errhandlerRichard van der Hoff2017-11-271-2/+4
| |\ \ \ \
| | * | | | Fix error handling on dns lookupRichard van der Hoff2017-11-241-2/+4
| | |/ / /
| * | | | Merge pull request #2710 from matrix-org/rav/remove_dead_codeRichard van der Hoff2017-11-271-2/+1
| |\ \ \ \
| | * | | | Add a comment which might save some confusionRichard van der Hoff2017-11-241-0/+1
| | * | | | Remove dead sync_callbackRichard van der Hoff2017-11-241-2/+0
| | |/ / /
| * | | | Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaksRichard van der Hoff2017-11-271-2/+4
| |\ \ \ \
| | * | | | Fix some logcontext leaks in replication resourceRichard van der Hoff2017-11-231-2/+4
| | |/ / /
| * | | | Merge pull request #2707 from matrix-org/rav/fix_urlpreviewRichard van der Hoff2017-11-271-1/+5
| |\ \ \ \
| | * | | | Fix OPTIONS on preview_urlRichard van der Hoff2017-11-231-1/+5
| | |/ / /
| * / / / Improve tracebacks on exceptionsRichard van der Hoff2017-11-271-3/+9
| |/ / /
| * | | Add config option to disable media_repo on main synapseRichard van der Hoff2017-11-223-8/+26
| * | | Build MediaRepositoryResource as a homeserver dependencyRichard van der Hoff2017-11-224-5/+19
| * | | Merge pull request #2698 from matrix-org/rav/remove_dead_dependenciesRichard van der Hoff2017-11-211-16/+15
| |\ \ \
| | * | | Clean up dependency listRichard van der Hoff2017-11-211-16/+15
| | |/ /
| * | | Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsertRichard van der Hoff2017-11-211-36/+49
| |\ \ \ | | |/ / | |/| |
| | * | Avoid locking account_data tables for upsertsRichard van der Hoff2017-11-161-36/+49
| * | | Merge pull request #2688 from matrix-org/rav/unlock_more_upsertRichard van der Hoff2017-11-172-5/+51
| |\ \ \
| | * | | Avoid locking for upsert on pushers tablesRichard van der Hoff2017-11-162-5/+51
| * | | | Merge branch 'master' into developRichard van der Hoff2017-11-171-1/+1
| |\ \ \ \
| * \ \ \ \ Merge pull request #2686 from matrix-org/luke/as-flairLuke Barnard2017-11-173-1/+48
| |\ \ \ \ \
| | * | | | | Extract group_id from the dict for multiple useLuke Barnard2017-11-161-4/+5
| | * | | | | Remove unused GROUP_ID_REGEXLuke Barnard2017-11-161-2/+0
| | * | | | | Document get_groups_for_userLuke Barnard2017-11-161-0/+6
| | * | | | | Flake8Luke Barnard2017-11-161-1/+1
| | * | | | | Use a generator instead of a listLuke Barnard2017-11-161-2/+2
| | * | | | | Make sure we check AS groups for lookup on bulkLuke Barnard2017-11-161-0/+5
| | * | | | | Check group_id belongs to this domainLuke Barnard2017-11-162-3/+12
| | * | | | | Add automagical AS Publicised Group(s)Luke Barnard2017-11-162-0/+28
| | | |_|_|/ | | |/| | |
| * | | | | typoMatthew Hodgson2017-11-171-1/+1
| | |_|_|/ | |/| | |
| * | | | Fix auth handler #2678Jurek2017-11-161-1/+1
| | |_|/ | |/| |
| * | | Fix broken ref to IntegrityErrorRichard van der Hoff2017-11-161-1/+1
| * | | Avoid locking `pushers` table on upsertRichard van der Hoff2017-11-161-27/+28
| * | | _simple_upsert: retry on IntegrityErrorRichard van der Hoff2017-11-161-6/+29
| * | | Cleanup in _simple_upsert_txnRichard van der Hoff2017-11-161-16/+17
| |/ /
| * | Merge pull request #2661 from matrix-org/rav/statereadstoreRichard van der Hoff2017-11-153-249/+237
| |\ \
| | * | Pull out bits of StateStore to a mixinRichard van der Hoff2017-11-142-237/+226
| | * | Revert "Revert "move _state_group_cache to statestore""Richard van der Hoff2017-11-142-13/+12
| * | | Declare support for r0.3.0Richard van der Hoff2017-11-151-0/+1
| * | | Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcsRichard van der Hoff2017-11-159-92/+23
| |\ \ \
| | * | | Remove __PreservingContextDeferred tooRichard van der Hoff2017-11-141-30/+0
| | * | | Remove preserve_context_over_{fn, deferred}Richard van der Hoff2017-11-149-62/+23
| * | | | Merge pull request #2650 from matrix-org/dbkr/push_include_content_optionDavid Baker2017-11-152-15/+32
| |\ \ \ \
| | * | | | Print instead of loggingDavid Baker2017-11-131-11/+4
| | * | | | Make the commented config have the defaultDavid Baker2017-11-091-1/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-13 17:52:38 +0000