summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Replace some ujson with simplejson to make it work github/erikj/fix_things erikj/fix_thingsErik Johnston2018-03-153-3/+4
* Fix log message in purge_historyRichard van der Hoff2018-02-131-2/+1
* Merge pull request #2864 from matrix-org/rav/persist_event_cachingRichard van der Hoff2018-02-132-60/+70
|\
| * style nitRichard van der Hoff2018-02-131-1/+1
| * Use StateResolutionHandler to resolve state in persist eventsRichard van der Hoff2018-02-051-48/+24
| * Flatten _get_new_state_after_eventsRichard van der Hoff2018-02-051-44/+46
| * Check that events being persisted have state_groupRichard van der Hoff2018-02-051-4/+9
| * Add event_map param to resolve_state_groupsRichard van der Hoff2018-02-052-4/+31
* | Fix typos in purge api & docRichard van der Hoff2018-02-132-4/+2
* | Merge pull request #2695 from okurz/feature/allow_recent_pysamlRichard van der Hoff2018-02-131-1/+1
|\ \
| * | Allow use of higher versions of saml2Oliver Kurz2017-11-201-1/+1
* | | Merge pull request #2857 from matrix-org/erikj/upload_storeErik Johnston2018-02-121-0/+6
|\ \ \
| * | | Tell storage providers about new file so they can uploadErik Johnston2018-02-071-0/+6
* | | | Merge pull request #2858 from matrix-org/rav/purge_updatesRichard van der Hoff2018-02-095-41/+100
|\ \ \ \
| * | | | purge: move room_depth update to endRichard van der Hoff2018-02-091-6/+12
| * | | | delete_local_events for purge_historyRichard van der Hoff2018-02-095-15/+67
| * | | | purge: Move cache invalidation to more appropriate placeRichard van der Hoff2018-02-091-4/+4
| * | | | bump purge logging to infoRichard van der Hoff2018-02-091-13/+14
| * | | | rename delete_old_state -> purge_historyRichard van der Hoff2018-02-092-8/+8
* | | | | Merge pull request #2856 from matrix-org/erikj/remove_ratelimitErik Johnston2018-02-071-5/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove pointless ratelimit checkErik Johnston2018-02-071-5/+0
|/ / / /
* | | | Merge pull request #2847 from matrix-org/erikj/separate_event_creationErik Johnston2018-02-0610-196/+217
|\ \ \ \
| * | | | Update copyrightErik Johnston2018-02-066-1/+6
| * | | | s/_create_new_client_event/create_new_client_event/Erik Johnston2018-02-064-12/+12
| * | | | Updates testsErik Johnston2018-02-052-8/+6
| * | | | Update places where we create eventsErik Johnston2018-02-057-38/+42
| * | | | Split event creation into a separate handlerErik Johnston2018-02-051-146/+160
* | | | | Store state groups separately from events (#2784)Erik Johnston2018-02-0612-189/+326
* | | | | Merge pull request #2849 from matrix-org/rav/clean_up_state_deltaRichard van der Hoff2018-02-051-10/+23
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove redundant return value from _calculate_state_deltaRichard van der Hoff2018-02-051-10/+23
* | | | | Merge pull request #2848 from matrix-org/rav/refactor_search_insertRichard van der Hoff2018-02-052-59/+94
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Factor out common code for search insertRichard van der Hoff2018-02-051-33/+62
| * | | | Move store_event_search_txn to SearchStoreRichard van der Hoff2018-02-052-35/+41
|/ / / /
* | | | Merge pull request #2844 from matrix-org/rav/evicted_metricsRichard van der Hoff2018-02-055-5/+56
|\ \ \ \ | |/ / / |/| | |
| * | | report metrics on number of cache evictionsRichard van der Hoff2018-02-055-5/+56
* | | | Fix broken unit test for media storageErik Johnston2018-02-051-1/+6
* | | | Add .vscode to gitignoreErik Johnston2018-02-051-0/+2
* | | | Merge pull request #2791 from matrix-org/erikj/media_storage_refactorErik Johnston2018-02-056-12/+156
|\ \ \ \
| * | | | Add unit testsErik Johnston2018-01-183-0/+109
| * | | | Use better file consumerErik Johnston2018-01-181-5/+10
| * | | | Ensure media is in local cache before thumbnailingErik Johnston2018-01-183-10/+40
* | | | | Merge pull request #2845 from matrix-org/rav/urlcache_error_handlingRichard van der Hoff2018-02-021-21/+34
|\ \ \ \ \
| * | | | | Handle url_previews with no content-typeRichard van der Hoff2018-02-021-21/+34
| | |/ / / | |/| | |
* | | | | Merge pull request #2842 from matrix-org/rav/state_resolution_handlerRichard van der Hoff2018-02-025-66/+119
|\ \ \ \ \
| * | | | | Factor out resolve_state_groups to a separate handlerRichard van der Hoff2018-02-014-54/+108
| * | | | | Rename resolve_state_groups -> resolve_state_groups_for_eventsRichard van der Hoff2018-02-012-12/+11
* | | | | | Merge pull request #2841 from matrix-org/rav/refactor_calc_state_deltaRichard van der Hoff2018-02-021-18/+39
|\ \ \ \ \ \
| * | | | | | factor _get_new_state_after_events out of _calculate_state_deltaRichard van der Hoff2018-01-311-18/+39
| |/ / / / /
* | | | | | Merge pull request #2836 from matrix-org/rav/resolve_state_events_docstringRichard van der Hoff2018-02-021-8/+28
|\ \ \ \ \ \
| * | | | | | doc arg types for _seperateRichard van der Hoff2018-02-011-0/+15
| * | | | | | More docstring fixesRichard van der Hoff2018-02-011-4/+4
| * | | | | | Fix docstring for StateHandler.resolve_state_groupsRichard van der Hoff2018-02-011-4/+9
* | | | | | | Merge pull request #2818 from turt2live/travis/admin-list-mediaRichard van der Hoff2018-02-023-56/+142
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'develop' into travis/admin-list-mediaTravis Ralston2018-02-0147-386/+716
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | 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
* | | | | | Script to move remote media to another media storeRichard van der Hoff2018-01-311-0/+133
| |/ / / / |/| | | |
* | | | | Merge pull request #2831 from matrix-org/rav/fix-userdir-search-againRichard van der Hoff2018-01-273-7/+96
|\ \ \ \ \
| * | | | | Add tests for user directory searchRichard van der Hoff2018-01-272-0/+89
| * | | | | Fix SQL for user searchRichard van der Hoff2018-01-271-7/+7
|/ / / / /
* | | | | Merge pull request #2829 from matrix-org/rav/postgres_in_testsRichard van der Hoff2018-01-272-38/+47
|\ \ \ \ \
| * | | | | Make it possible to run tests against postgresRichard van der Hoff2018-01-271-9/+34
| * | | | | Create dbpool as normal in testsRichard van der Hoff2018-01-272-45/+19
| * | | | | Run on_new_connection for unit testsRichard van der Hoff2018-01-271-7/+17
|/ / / / /
* | | | | Merge pull request #2828 from matrix-org/rav/kill_memory_datastoreRichard van der Hoff2018-01-271-151/+13
|\ \ \ \ \
| * | | | | Remove unused/bitrotted MemoryDataStoreRichard van der Hoff2018-01-261-151/+13
* | | | | | 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
* | | | | | Remove spurious unittest.DEBUGRichard van der Hoff2018-01-261-1/+0
* | | | | | 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
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #2821 from matrix-org/rav/matthew_test_fixesRichard van der Hoff2018-01-221-2/+6
|\ \ \ \ \ \
| * | | | | | Matthew's fixes to the unit testsRichard van der Hoff2018-01-221-2/+6
* | | | | | | Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-2214-7/+146
|/ / / / / /
* | | | | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pidMatthew Hodgson2018-01-228-23/+178
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
| * | | | | mock registrations_require_3pidMatthew Hodgson2018-01-191-0/+1
| * | | | | add registrations_require_3pidMatthew Hodgson2018-01-195-13/+110
| | | * | | pep8Travis Ralston2018-01-311-9/+12
| | | * | | Add admin api documentation for list media endpointTravis Ralston2018-01-311-0/+23
| | | * | | Documentation and namingTravis Ralston2018-01-311-7/+26
| | | * | | Appease the linterTravis Ralston2018-01-201-5/+5
| | | * | | Add an admin route to get all the media in a roomTravis Ralston2018-01-202-56/+97
| |_|/ / / |/| | | |
* | | | | 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-182-0/+315
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Do logcontexts correctlyErik Johnston2018-01-181-2/+2
| * | | | | Move test stuff to testsErik Johnston2018-01-182-33/+47
| * | | | | 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-172-0/+296
| |/ / / /
* | | | | Fix typo in thumbnail resource causing access times to be incorrectErik Johnston2018-01-181-2/+2
* | | | | Merge pull request #2810 from matrix-org/rav/metrics_fixesRichard van der Hoff2018-01-181-2/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | | | | Merge pull request #2802 from matrix-org/rav/clean_up_resolve_eventsRichard van der Hoff2018-01-172-20/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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-166-31/+49
| |\ \ \ \ \
* | \ \ \ \ \ 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-177-47/+102
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Fix 'NoneType' object has no attribute 'writeHeaders'Richard van der Hoff2018-01-161-9/+9
* | | | | | | | Merge pull request #2794 from matrix-org/rav/rework_run_interactionRichard van der Hoff2018-01-171-20/+31
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'develop' into rav/rework_run_interactionRichard van der Hoff2018-01-177-47/+102
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #2792 from matrix-org/rav/optimise_logging_contextRichard van der Hoff2018-01-173-22/+33
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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-163-22/+33
| |/ / / / |/| | | |
| | * | | 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-165-47/+209
|\ \ \ \
| * | | | document metrics changesRichard van der Hoff2018-01-162-8/+58
| * | | | 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-129-28/+116
| |\ \ \
| * | | | 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
* | | | | Merge pull request #2778 from matrix-org/rav/counters_should_be_floatsRichard van der Hoff2018-01-151-3/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make Counter render floatsRichard van der Hoff2018-01-121-3/+10
|/ / / /
* | | | Merge pull request #2777 from matrix-org/rav/fix_remote_thumbnailsRichard van der Hoff2018-01-121-0/+5
|\ \ \ \
| * | | | Reinstate media download on thumbnail requestRichard van der Hoff2018-01-121-0/+5
|/ / / /
* | | | Merge pull request #2774 from matrix-org/erikj/synctlErik Johnston2018-01-123-5/+38
|\ \ \ \ | |_|/ / |/| | |
| * | | 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-112-8/+33
* | | | 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-113-1/+49
|\ \ \ \
| * \ \ \ Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse v0.26.0Erik Johnston2018-01-0577-826/+1829
| |\ \ \ \
| | * | | | Bump version and changelog github/release-v0.26.0 release-v0.26.0Erik Johnston2018-01-052-1/+7
| | * | | | Fix rc version number v0.26.0-rc1Erik Johnston2017-12-131-2/+2
| | * | | | Bump changelog and versionErik Johnston2017-12-132-1/+38
| * | | | | Merge pull request #2737 from Valodim/masterMatthew Hodgson2017-12-171-0/+5
| |\ \ \ \ \
| | * | | | | mention federation tester more prominently in the readmeVincent Breitmoser2017-12-161-0/+5
| |/ / / / /
* | | | | | 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
* | | | | | | Merge pull request #2772 from matrix-org/t3chguy/patch-1Erik Johnston2018-01-101-3/+4
|\ \ \ \ \ \ \
| * | | | | | | 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
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2764 from matrix-org/erikj/remove_dead_thumbnail_codeErik Johnston2018-01-092-78/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove dead TODOErik Johnston2018-01-091-2/+0
| * | | | | Remove dead code related to default thumbnailsErik Johnston2018-01-092-76/+3
|/ / / / /
* | | | | Merge pull request #2765 from matrix-org/rav/fix_room_utsRichard van der Hoff2018-01-093-4/+9
|\ \ \ \ \
| * | | | | enable twisted delayedcall debugging in UTsRichard van der Hoff2018-01-091-1/+5
| * | | | | Remove dead codeRichard van der Hoff2018-01-091-3/+0
| * | | | | Disable user_directory updates for UTsRichard van der Hoff2018-01-091-0/+4
* | | | | | Merge pull request #2763 from matrix-org/rav/fix_config_utsRichard van der Hoff2018-01-092-3/+18
|\ \ \ \ \ \
| * | | | | | Fix broken config UTsRichard van der Hoff2018-01-092-3/+18
| |/ / / / /
* | | | | | Merge pull request #2762 from matrix-org/rav/fix_logconfig_indentingRichard van der Hoff2018-01-091-17/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make indentation of generated log config consistentRichard van der Hoff2018-01-091-17/+17
|/ / / / /
* | | | | Merge pull request #2761 from turt2live/patch-1Erik Johnston2018-01-081-1/+1
|\ \ \ \ \
| * | | | | Fix templating error with unban permission messageTravis Ralston2018-01-071-1/+1
|/ / / / /
* | | | | Merge pull request #2755 from matrix-org/richvdh-patch-1Richard van der Hoff2018-01-051-8/+4
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge pull request #2745 from matrix-org/rav/assert_paramsRichard van der Hoff2018-01-053-60/+68
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|/ / / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-21 07:50:14 +0000