Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Handle url_previews with no content-type | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2842 from matrix-org/rav/state_resolution_handler | Richard van der Hoff | 2018-02-02 | 4 | -65/+116 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Factor out resolve_state_groups to a separate handler | Richard van der Hoff | 2018-02-01 | 3 | -53/+105 | |
| * | | | | | | | Rename resolve_state_groups -> resolve_state_groups_for_events | Richard van der Hoff | 2018-02-01 | 2 | -12/+11 | |
* | | | | | | | | Merge pull request #2841 from matrix-org/rav/refactor_calc_state_delta | Richard van der Hoff | 2018-02-02 | 1 | -18/+39 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | factor _get_new_state_after_events out of _calculate_state_delta | Richard van der Hoff | 2018-01-31 | 1 | -18/+39 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #2836 from matrix-org/rav/resolve_state_events_docstring | Richard van der Hoff | 2018-02-02 | 1 | -8/+28 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | doc arg types for _seperate | Richard van der Hoff | 2018-02-01 | 1 | -0/+15 | |
| * | | | | | | | | More docstring fixes | Richard van der Hoff | 2018-02-01 | 1 | -4/+4 | |
| * | | | | | | | | Fix docstring for StateHandler.resolve_state_groups | Richard van der Hoff | 2018-02-01 | 1 | -4/+9 | |
* | | | | | | | | | Merge branch 'develop' into travis/admin-list-media | Travis Ralston | 2018-02-01 | 40 | -195/+427 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge pull request #2837 from matrix-org/rav/fix_quarantine_media | Richard van der Hoff | 2018-02-01 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Fix sql error in quarantine_media | Richard van der Hoff | 2018-01-30 | 1 | -1/+1 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #2838 from matrix-org/rav/fix_logging_on_dns_fail | Richard van der Hoff | 2018-01-31 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Remove spurious log argument | Richard van der Hoff | 2018-01-30 | 1 | -2/+1 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #2835 from matrix-org/rav/remove_event_type_param | Richard van der Hoff | 2018-01-31 | 1 | -6/+14 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | docstring for get_current_state_ids | Richard van der Hoff | 2018-01-29 | 1 | -0/+13 | |
| | * | | | | | | | Remove unused "event_type" param on state.get_current_state_ids | Richard van der Hoff | 2018-01-29 | 1 | -6/+1 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #2834 from matrix-org/rav/better_persist_event_exception_h... | Richard van der Hoff | 2018-01-31 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Improve exception handling in persist_event | Richard van der Hoff | 2018-01-29 | 1 | -3/+3 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #2833 from matrix-org/rav/pusher_hacks | Richard van der Hoff | 2018-01-31 | 1 | -7/+30 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Better logging when pushes fail | Richard van der Hoff | 2018-01-29 | 1 | -2/+8 | |
| | * | | | | | | add appid/device_display_name to to pusher logging | Richard van der Hoff | 2018-01-29 | 1 | -2/+2 | |
| | * | | | | | | Fix logging and add user_id | Richard van der Hoff | 2018-01-22 | 1 | -2/+3 | |
| | * | | | | | | logging and debug for http pusher | Richard van der Hoff | 2018-01-22 | 1 | -4/+20 | |
| * | | | | | | | Merge pull request #2817 from matrix-org/rav/http_conn_pool | Richard van der Hoff | 2018-01-31 | 1 | -1/+13 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | Increase http conn pool size | Richard van der Hoff | 2018-01-29 | 1 | -1/+6 | |
| | |/ / / / / | ||||||
| | * | | | | | Use a connection pool for the SimpleHttpClient | Richard van der Hoff | 2018-01-20 | 1 | -1/+8 | |
| * | | | | | | Fix SQL for user search | Richard van der Hoff | 2018-01-27 | 1 | -7/+7 | |
| * | | | | | | Merge pull request #2830 from matrix-org/rav/factor_out_get_conn | Richard van der Hoff | 2018-01-27 | 11 | -130/+17 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Factor out get_db_conn to HomeServer base class | Richard van der Hoff | 2018-01-26 | 11 | -130/+17 | |
| * | | | | | | | Merge pull request #2827 from matrix-org/fix_server_500_on_public_rooms_call_... | Neil Johnson | 2018-01-26 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | add white space line | Neil Johnson | 2018-01-26 | 1 | -0/+1 | |
| | * | | | | | | rather than try reconstruct the results object, better to guard against the x... | Neil Johnson | 2018-01-26 | 1 | -6/+2 | |
| | * | | | | | | fix return type, should be a dict | Neil Johnson | 2018-01-25 | 1 | -1/+1 | |
| | * | | | | | | fix PEP8 violation | Neil Johnson | 2018-01-25 | 1 | -1/+1 | |
| | * | | | | | | remove white space | Neil Johnson | 2018-01-25 | 1 | -1/+0 | |
| | * | | | | | | synapse 500s on a call to publicRooms in the case where the number of public ... | Neil Johnson | 2018-01-25 | 1 | -0/+5 | |
| * | | | | | | | fix thinko on 3pid whitelisting | Matthew Hodgson | 2018-01-24 | 1 | -2/+2 | |
| * | | | | | | | Merge pull request #2816 from matrix-org/rav/metrics_comments | Richard van der Hoff | 2018-01-23 | 1 | -1/+6 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Add some comments about the reactor tick time metric | Richard van der Hoff | 2018-01-19 | 1 | -1/+6 | |
| * | | | | | | | | add ?ts massaging for ASes (#2754) | Matthew Hodgson | 2018-01-23 | 1 | -6/+11 | |
| | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 13 | -7/+145 | |
| * | | | | | | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid | Matthew Hodgson | 2018-01-22 | 7 | -23/+177 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | fix typo (thanks sytest) | Matthew Hodgson | 2018-01-19 | 1 | -1/+1 | |
| | * | | | | | | oops, check all login types | Matthew Hodgson | 2018-01-19 | 1 | -14/+11 | |
| | * | | | | | | fix PR nitpicking | Matthew Hodgson | 2018-01-19 | 1 | -3/+6 | |
| | * | | | | | | trailing commas | Matthew Hodgson | 2018-01-19 | 2 | -7/+7 | |
| | * | | | | | | rewrite based on PR feedback: | Matthew Hodgson | 2018-01-19 | 7 | -89/+102 | |
| | * | | | | | | fix up v1, and improve errors | Matthew Hodgson | 2018-01-19 | 4 | -20/+65 | |
| | * | | | | | | fix pep8 | Matthew Hodgson | 2018-01-19 | 1 | -2/+1 | |
| | * | | | | | | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 5 | -13/+110 | |
* | | | | | | | | pep8 | Travis Ralston | 2018-01-31 | 1 | -9/+12 | |
* | | | | | | | | Documentation and naming | Travis Ralston | 2018-01-31 | 1 | -7/+26 | |
* | | | | | | | | Appease the linter | Travis Ralston | 2018-01-20 | 1 | -5/+5 | |
* | | | | | | | | Add an admin route to get all the media in a room | Travis Ralston | 2018-01-20 | 2 | -56/+97 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbs | Richard van der Hoff | 2018-01-19 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use the right path for url_preview thumbnails | Richard van der Hoff | 2018-01-19 | 1 | -0/+8 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Fix storage provider bug introduced when renamed to store_local | Erik Johnston | 2018-01-18 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #2812 from matrix-org/erikj/media_storage_provider_config | Erik Johnston | 2018-01-18 | 3 | -33/+101 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix passing wrong config to provider constructor | Erik Johnston | 2018-01-18 | 1 | -1/+1 | |
| * | | | | | | | Remove duplicate directory test | Erik Johnston | 2018-01-18 | 1 | -4/+0 | |
| * | | | | | | | Missing staticmethod | Erik Johnston | 2018-01-18 | 1 | -0/+1 | |
| * | | | | | | | Fixup comments | Erik Johnston | 2018-01-18 | 2 | -3/+7 | |
| * | | | | | | | Make storage providers more configurable | Erik Johnston | 2018-01-18 | 3 | -31/+98 | |
* | | | | | | | | Merge pull request #2804 from matrix-org/erikj/file_consumer | Erik Johnston | 2018-01-18 | 1 | -0/+139 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | Do logcontexts correctly | Erik Johnston | 2018-01-18 | 1 | -2/+2 | |
| * | | | | | | | Move test stuff to tests | Erik Johnston | 2018-01-18 | 1 | -25/+1 | |
| * | | | | | | | Make all fields private | Erik Johnston | 2018-01-18 | 1 | -31/+31 | |
| * | | | | | | | Ensure we registerProducer isn't called twice | Erik Johnston | 2018-01-18 | 1 | -0/+3 | |
| * | | | | | | | Fix _notify_empty typo | Erik Johnston | 2018-01-18 | 1 | -1/+1 | |
| * | | | | | | | Move definition of paused_producer to __init__ | Erik Johnston | 2018-01-18 | 1 | -2/+4 | |
| * | | | | | | | Fix comments | Erik Johnston | 2018-01-18 | 1 | -3/+3 | |
| * | | | | | | | Add decent impl of a FileConsumer | Erik Johnston | 2018-01-17 | 1 | -0/+158 | |
| |/ / / / / / | ||||||
* | / / / / / | Fix typo in thumbnail resource causing access times to be incorrect | Erik Johnston | 2018-01-18 | 1 | -2/+2 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Fix bugs in block metrics | Richard van der Hoff | 2018-01-18 | 1 | -2/+4 | |
* | | | | | | Merge pull request #2809 from matrix-org/rav/metrics_errors | Richard van der Hoff | 2018-01-18 | 1 | -1/+8 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | better exception logging in callbackmetrics | Richard van der Hoff | 2018-01-18 | 1 | -1/+8 | |
* | | | | | | Merge pull request #2805 from matrix-org/rav/log_state_res | Richard van der Hoff | 2018-01-17 | 1 | -0/+6 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Log room when doing state resolution | Richard van der Hoff | 2018-01-17 | 1 | -0/+6 | |
* | | | | | | Merge pull request #2783 from matrix-org/erikj/media_last_accessed | Erik Johnston | 2018-01-17 | 5 | -11/+64 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove lost comment | Erik Johnston | 2018-01-17 | 1 | -3/+0 | |
| * | | | | | | Update last access time when thumbnails are viewed | Erik Johnston | 2018-01-17 | 1 | -0/+2 | |
| * | | | | | | Keep track of last access time for local media | Erik Johnston | 2018-01-17 | 4 | -11/+65 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #2803 from matrix-org/matthew/fix-userdir-sql | Matthew Hodgson | 2018-01-17 | 1 | -2/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix SQL when searching all users | Matthew Hodgson | 2018-01-17 | 1 | -2/+7 | |
* | | | | | | | Split resolve_events into two functions | Richard van der Hoff | 2018-01-17 | 2 | -20/+29 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2795 from matrix-org/rav/track_db_scheduling | Richard van der Hoff | 2018-01-17 | 5 | -4/+43 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/track_db_scheduling | Richard van der Hoff | 2018-01-17 | 5 | -34/+78 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Track DB scheduling delay per-request | Richard van der Hoff | 2018-01-16 | 5 | -4/+43 | |
| * | | | | | | | Merge branch 'rav/db_txn_time_in_millis' into rav/track_db_scheduling | Richard van der Hoff | 2018-01-16 | 4 | -16/+34 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | Merge pull request #2797 from matrix-org/rav/user_id_checking | Richard van der Hoff | 2018-01-17 | 2 | -8/+19 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Sanity checking for user ids | Richard van der Hoff | 2018-01-17 | 2 | -8/+19 | |
* | | | | | | | | | Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millis | Richard van der Hoff | 2018-01-17 | 4 | -10/+17 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Merge branch 'develop' into rav/db_txn_time_in_millis | Richard van der Hoff | 2018-01-17 | 4 | -25/+69 | |
| |\| | | | | | | | | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Track db txn time in millisecs | Richard van der Hoff | 2018-01-16 | 4 | -10/+17 | |
* | | | | | | | | | Merge pull request #2796 from matrix-org/rav/fix_closed_connection_errors | Richard van der Hoff | 2018-01-17 | 1 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into rav/fix_closed_connection_errors | Richard van der Hoff | 2018-01-17 | 5 | -32/+87 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Fix 'NoneType' object has no attribute 'writeHeaders' | Richard van der Hoff | 2018-01-16 | 1 | -9/+9 | |
* | | | | | | | | | | Merge branch 'develop' into rav/rework_run_interaction | Richard van der Hoff | 2018-01-17 | 5 | -32/+87 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | / / / / / / | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/optimise_logging_context | Richard van der Hoff | 2018-01-17 | 4 | -25/+69 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #2789 from matrix-org/erikj/fix_thumbnails | Erik Johnston | 2018-01-17 | 3 | -24/+68 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Add docstring | Erik Johnston | 2018-01-17 | 1 | -1/+1 | |
| | | * | | | | | | Use local vars | Erik Johnston | 2018-01-16 | 1 | -6/+2 | |
| | | * | | | | | | Change _generate_thumbnails to take media_type | Erik Johnston | 2018-01-16 | 2 | -7/+10 | |
| | | * | | | | | | Move setting of file_id up to caller | Erik Johnston | 2018-01-16 | 2 | -13/+14 | |
| | | * | | | | | | Fix typo | Erik Johnston | 2018-01-16 | 1 | -7/+10 | |
| | | * | | | | | | Fix up log lines | Erik Johnston | 2018-01-16 | 2 | -7/+10 | |
| | | * | | | | | | Correctly use server_name/file_id when generating/fetching remote thumbnails | Erik Johnston | 2018-01-16 | 2 | -5/+8 | |
| | | * | | | | | | Log when we respond with 404 | Erik Johnston | 2018-01-16 | 2 | -1/+8 | |
| | | * | | | | | | Fix thumbnailing remote files | Erik Johnston | 2018-01-16 | 2 | -2/+30 | |
| | * | | | | | | | fix typo | Matthew Hodgson | 2018-01-16 | 1 | -1/+1 | |
| | | |/ / / / / | | |/| | | | | | ||||||
| * / | | | | | | Optimise LoggingContext creation and copying | Richard van der Hoff | 2018-01-16 | 1 | -7/+18 | |
| |/ / / / / / | ||||||
* / / / / / / | rework runInteraction in terms of runConnection | Richard van der Hoff | 2018-01-16 | 1 | -20/+31 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2785 from matrix-org/rav/reorganise_metrics_again | Richard van der Hoff | 2018-01-16 | 3 | -39/+151 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Reorganise request and block metrics | Richard van der Hoff | 2018-01-15 | 2 | -25/+84 | |
| * | | | | | | mechanism to render metrics with alternative names | Richard van der Hoff | 2018-01-15 | 1 | -13/+40 | |
| * | | | | | | Add some comments to metrics classes | Richard van der Hoff | 2018-01-15 | 1 | -1/+27 | |
* | | | | | | | Merge pull request #2790 from matrix-org/rav/preserve_event_logcontext_leak | Richard van der Hoff | 2018-01-16 | 1 | -1/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix a logcontext leak in persist_events | Richard van der Hoff | 2018-01-16 | 1 | -1/+8 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2787 from matrix-org/rav/worker_event_counts | Richard van der Hoff | 2018-01-16 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Metrics for events processed in appservice and fed sender | Richard van der Hoff | 2018-01-15 | 2 | -0/+11 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2786 from matrix-org/rav/rdata_metrics | Richard van der Hoff | 2018-01-16 | 1 | -5/+14 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Metrics for number of RDATA commands received | Richard van der Hoff | 2018-01-15 | 1 | -5/+14 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-01-16 | 7 | -346/+843 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Fix up comments | Erik Johnston | 2018-01-12 | 2 | -7/+16 | |
| * | | | | | Correctly reraise exception | Erik Johnston | 2018-01-12 | 1 | -2/+4 | |
| * | | | | | Make Responder a context manager | Erik Johnston | 2018-01-12 | 2 | -9/+10 | |
| * | | | | | Add missing class var | Erik Johnston | 2018-01-12 | 1 | -0/+3 | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_stor... | Erik Johnston | 2018-01-12 | 7 | -28/+68 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Remove unnecessary condition | Erik Johnston | 2018-01-12 | 1 | -4/+1 | |
| * | | | | | | Remove unused variables | Erik Johnston | 2018-01-12 | 1 | -3/+0 | |
| * | | | | | | Make class var local | Erik Johnston | 2018-01-12 | 1 | -3/+3 | |
| * | | | | | | Comments | Erik Johnston | 2018-01-12 | 3 | -15/+65 | |
| * | | | | | | Add StorageProvider concept | Erik Johnston | 2018-01-09 | 3 | -9/+162 | |
| * | | | | | | Make PreviewUrlResource use MediaStorage | Erik Johnston | 2018-01-09 | 2 | -8/+14 | |
| * | | | | | | Make ThumbnailResource use MediaStorage | Erik Johnston | 2018-01-09 | 2 | -48/+68 | |
| * | | | | | | Use MediaStorage for remote media | Erik Johnston | 2018-01-09 | 2 | -136/+156 | |
| * | | | | | | Use MediaStorage for local files | Erik Johnston | 2018-01-09 | 2 | -119/+73 | |
| * | | | | | | Add MediaStorage class | Erik Johnston | 2018-01-09 | 1 | -0/+198 | |
| * | | | | | | Add some helper classes | Erik Johnston | 2018-01-09 | 1 | -0/+73 | |
| * | | | | | | Split out add_file_headers | Erik Johnston | 2018-01-09 | 1 | -28/+42 | |
* | | | | | | | Make Counter render floats | Richard van der Hoff | 2018-01-12 | 1 | -3/+10 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Reinstate media download on thumbnail request | Richard van der Hoff | 2018-01-12 | 1 | -0/+5 | |
* | | | | | | Merge pull request #2774 from matrix-org/erikj/synctl | Erik Johnston | 2018-01-12 | 2 | -5/+31 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Actually make it work | Erik Johnston | 2018-01-12 | 2 | -2/+15 | |
| * | | | | | Refactor | Erik Johnston | 2018-01-12 | 1 | -9/+4 | |
| * | | | | | When using synctl with workers, don't start the main synapse automatically | Erik Johnston | 2018-01-11 | 1 | -8/+26 | |
* | | | | | | Merge pull request #2766 from matrix-org/rav/room_event | Richard van der Hoff | 2018-01-11 | 1 | -3/+26 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add /room/{id}/event/{id} to synapse | Richard van der Hoff | 2018-01-09 | 1 | -3/+26 | |
* | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-01-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Bump version and changelog github/release-v0.26.0 release-v0.26.0 | Erik Johnston | 2018-01-05 | 1 | -1/+1 | |
| * | | | | | Bump changelog and version | Erik Johnston | 2017-12-13 | 1 | -1/+1 | |
* | | | | | | Merge pull request #2773 from matrix-org/erikj/hash_bg | Erik Johnston | 2018-01-10 | 3 | -10/+18 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Do bcrypt hashing in a background thread | Erik Johnston | 2018-01-10 | 3 | -10/+18 | |
* | | | | | | | fix order of operations derp and also use `.get` to default to {} | Michael Telatynski | 2018-01-10 | 1 | -2/+3 | |
* | | | | | | | Fix publicised groups API (singular) over federation | Michael Telatynski | 2018-01-10 | 1 | -4/+4 | |
* | | | | | | | Merge pull request #2770 from matrix-org/rav/fix_request_metrics | Richard van der Hoff | 2018-01-10 | 1 | -11/+19 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Update http request metrics before calling servlet | Richard van der Hoff | 2018-01-09 | 1 | -11/+19 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Remove dead TODO | Erik Johnston | 2018-01-09 | 1 | -2/+0 | |
* | | | | | | Remove dead code related to default thumbnails | Erik Johnston | 2018-01-09 | 2 | -76/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2763 from matrix-org/rav/fix_config_uts | Richard van der Hoff | 2018-01-09 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix broken config UTs | Richard van der Hoff | 2018-01-09 | 1 | -2/+2 | |
* | | | | | | Make indentation of generated log config consistent | Richard van der Hoff | 2018-01-09 | 1 | -17/+17 | |
|/ / / / / | ||||||
* | | | | | Fix templating error with unban permission message | Travis Ralston | 2018-01-07 | 1 | -1/+1 | |
* | | | | | Remove 'verbosity'/'log_file' from generated cfg | Richard van der Hoff | 2018-01-05 | 1 | -8/+4 | |
* | | | | | Merge pull request #2744 from matrix-org/rav/login_logging | Richard van der Hoff | 2018-01-05 | 1 | -4/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Better logging when login can't find a 3pid | Richard van der Hoff | 2017-12-20 | 1 | -4/+10 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Check missing fields in event_from_pdu_json | Richard van der Hoff | 2017-12-30 | 1 | -0/+7 | |
* | | | | | Factor out `event_from_pdu_json` | Richard van der Hoff | 2017-12-30 | 3 | -37/+44 | |
* | | | | | federation_server: clean up imports | Richard van der Hoff | 2017-12-30 | 1 | -14/+11 | |
* | | | | | federation_client: clean up imports | Richard van der Hoff | 2017-12-30 | 1 | -13/+10 | |
|/ / / / | ||||||
* | | | | Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typo | Richard van der Hoff | 2017-12-18 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | synapse/config/password_auth_providers: Fixed bracket typo | Richard von Seck | 2017-11-16 | 1 | -2/+2 | |
* | | | | | Implement listen_tcp method in remaining workers | Silke | 2017-12-18 | 10 | -192/+155 | |
* | | | | | Remove logger argument and do not catch replication listener | Silke | 2017-12-18 | 2 | -24/+18 | |
* | | | | | Add methods for listening on multiple addresses | Silke Hofstra | 2017-12-17 | 2 | -51/+90 | |
* | | | | | Allow binds to both :: and 0.0.0.0 | Silke Hofstra | 2017-12-17 | 2 | -42/+61 | |
* | | | | | Adapt the default config to bind on IPv6. | Willem Mulder | 2017-12-17 | 1 | -8/+9 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom... | Erik Johnston | 2017-12-07 | 63 | -781/+1462 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #2723 from matrix-org/matthew/search-all-local-users | Matthew Hodgson | 2017-12-05 | 10 | -36/+221 | |
| |\ \ \ \ | ||||||
| | * | | | | fix StoreError syntax | Matthew Hodgson | 2017-12-05 | 1 | -1/+1 | |
| | * | | | | speed up the rate of initial spam for users | Matthew Hodgson | 2017-12-04 | 1 | -11/+12 | |
| | * | | | | better doc | Matthew Hodgson | 2017-12-04 | 1 | -1/+4 | |
| | * | | | | fix pep8 and tests | Matthew Hodgson | 2017-12-04 | 3 | -8/+6 | |
| | * | | | | switch to a simpler 'search_all_users' button as per review feedback | Matthew Hodgson | 2017-12-04 | 5 | -37/+30 | |
| | * | | | | Merge branch 'develop' into matthew/search-all-local-users | Matthew Hodgson | 2017-11-30 | 31 | -179/+497 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | * | | | | specify default user_directory_include_pattern | Matthew Hodgson | 2017-11-30 | 1 | -0/+1 | |
| | * | | | | remove null constraint on user_dir.room_id | Matthew Hodgson | 2017-11-30 | 1 | -0/+35 | |
| | * | | | | fix alternation operator for FTS4 - how did this ever work!? | Matthew Hodgson | 2017-11-30 | 1 | -1/+1 | |
| | * | | | | fix thinkos galore | Matthew Hodgson | 2017-11-30 | 3 | -20/+41 | |
| | * | | | | kick the user_directory index when new users register | Matthew Hodgson | 2017-11-29 | 1 | -0/+8 | |
| | * | | | | untested WIP but might actually work | Matthew Hodgson | 2017-11-29 | 6 | -20/+96 | |
| | * | | | | Add user_directory_include_pattern config param to expand search results to a... | Matthew Hodgson | 2017-11-29 | 5 | -9/+58 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | Fix error when deleting devices | Richard van der Hoff | 2017-12-05 | 1 | -1/+1 | |
| * | | | | support custom login types for validating users | Richard van der Hoff | 2017-12-05 | 1 | -24/+57 | |
| * | | | | Factor out a validate_user_via_ui_auth method | Richard van der Hoff | 2017-12-05 | 3 | -74/+102 | |
| * | | | | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 6 | -44/+96 | |
| | |/ / | |/| | | ||||||
| * | | | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_comments | Richard van der Hoff | 2017-11-29 | 1 | -1/+5 | |
| |\ \ \ | ||||||
| | * | | | Improve comments on get_user_by_access_token | Richard van der Hoff | 2017-11-29 | 1 | -1/+5 | |
| * | | | | Delete devices in various logout situations | Richard van der Hoff | 2017-11-29 | 5 | -5/+75 | |
| * | | | | Move set_password into its own handler | Richard van der Hoff | 2017-11-29 | 6 | -19/+58 | |
| * | | | | Move deactivate_account into its own handler | Richard van der Hoff | 2017-11-29 | 6 | -22/+61 | |
| * | | | | Remove pushers when deleting access tokens | Richard van der Hoff | 2017-11-29 | 3 | -18/+32 | |
| * | | | | Merge pull request #2718 from matrix-org/rav/notify_logcontexts | Richard van der Hoff | 2017-11-29 | 2 | -9/+18 | |
| |\ \ \ \ | ||||||
| | * | | | | Clear logcontext before starting fed txn queue runner | Richard van der Hoff | 2017-11-28 | 2 | -9/+18 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #2719 from matrix-org/rav/handle_missing_hashes | Richard van der Hoff | 2017-11-29 | 1 | -3/+10 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix 500 when joining matrix-dev | Richard van der Hoff | 2017-11-29 | 1 | -3/+10 | |
| | |/ / / | ||||||
| * / / / | Allow guest access to group APIs for reading | Luke Barnard | 2017-11-28 | 1 | -11/+11 | |
| |/ / / | ||||||
| * | | | Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_error | Richard van der Hoff | 2017-11-27 | 6 | -17/+89 | |
| |\ \ \ | ||||||
| | * | | | fix sql fails | Richard van der Hoff | 2017-11-22 | 1 | -1/+1 | |
| | * | | | Check database in has_completed_background_updates | Richard van der Hoff | 2017-11-22 | 3 | -12/+33 | |
| | * | | | Fix error on sqlite 3.7 | Richard van der Hoff | 2017-11-21 | 5 | -8/+59 | |
| | |/ / | ||||||
| * | | | Merge pull request #2713 from matrix-org/rav/no_upsert_forever | Richard van der Hoff | 2017-11-27 | 1 | -0/+7 | |
| |\ \ \ | ||||||
| | * | | | Avoid retrying forever on IntegrityError | Richard van der Hoff | 2017-11-27 | 1 | -0/+7 | |
| * | | | | Merge pull request #2711 from matrix-org/rav/fix_dns_errhandler | Richard van der Hoff | 2017-11-27 | 1 | -2/+4 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix error handling on dns lookup | Richard van der Hoff | 2017-11-24 | 1 | -2/+4 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #2710 from matrix-org/rav/remove_dead_code | Richard van der Hoff | 2017-11-27 | 1 | -2/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Add a comment which might save some confusion | Richard van der Hoff | 2017-11-24 | 1 | -0/+1 | |
| | * | | | | Remove dead sync_callback | Richard van der Hoff | 2017-11-24 | 1 | -2/+0 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaks | Richard van der Hoff | 2017-11-27 | 1 | -2/+4 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix some logcontext leaks in replication resource | Richard van der Hoff | 2017-11-23 | 1 | -2/+4 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #2707 from matrix-org/rav/fix_urlpreview | Richard van der Hoff | 2017-11-27 | 1 | -1/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix OPTIONS on preview_url | Richard van der Hoff | 2017-11-23 | 1 | -1/+5 | |
| | |/ / / | ||||||
| * / / / | Improve tracebacks on exceptions | Richard van der Hoff | 2017-11-27 | 1 | -3/+9 | |
| |/ / / | ||||||
| * | | | Add config option to disable media_repo on main synapse | Richard van der Hoff | 2017-11-22 | 3 | -8/+26 | |
| * | | | Build MediaRepositoryResource as a homeserver dependency | Richard van der Hoff | 2017-11-22 | 4 | -5/+19 | |
| * | | | Merge pull request #2698 from matrix-org/rav/remove_dead_dependencies | Richard van der Hoff | 2017-11-21 | 1 | -16/+15 | |
| |\ \ \ | ||||||
| | * | | | Clean up dependency list | Richard van der Hoff | 2017-11-21 | 1 | -16/+15 | |
| | |/ / | ||||||
| * | | | Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsert | Richard van der Hoff | 2017-11-21 | 1 | -36/+49 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | Avoid locking account_data tables for upserts | Richard van der Hoff | 2017-11-16 | 1 | -36/+49 | |
| * | | | Merge pull request #2688 from matrix-org/rav/unlock_more_upsert | Richard van der Hoff | 2017-11-17 | 2 | -5/+51 | |
| |\ \ \ | ||||||
| | * | | | Avoid locking for upsert on pushers tables | Richard van der Hoff | 2017-11-16 | 2 | -5/+51 | |
| * | | | | Merge branch 'master' into develop | Richard van der Hoff | 2017-11-17 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #2686 from matrix-org/luke/as-flair | Luke Barnard | 2017-11-17 | 3 | -1/+48 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Extract group_id from the dict for multiple use | Luke Barnard | 2017-11-16 | 1 | -4/+5 | |
| | * | | | | | Remove unused GROUP_ID_REGEX | Luke Barnard | 2017-11-16 | 1 | -2/+0 | |
| | * | | | | | Document get_groups_for_user | Luke Barnard | 2017-11-16 | 1 | -0/+6 | |
| | * | | | | | Flake8 | Luke Barnard | 2017-11-16 | 1 | -1/+1 | |
| | * | | | | | Use a generator instead of a list | Luke Barnard | 2017-11-16 | 1 | -2/+2 | |
| | * | | | | | Make sure we check AS groups for lookup on bulk | Luke Barnard | 2017-11-16 | 1 | -0/+5 | |
| | * | | | | | Check group_id belongs to this domain | Luke Barnard | 2017-11-16 | 2 | -3/+12 | |
| | * | | | | | Add automagical AS Publicised Group(s) | Luke Barnard | 2017-11-16 | 2 | -0/+28 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | typo | Matthew Hodgson | 2017-11-17 | 1 | -1/+1 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | Fix auth handler #2678 | Jurek | 2017-11-16 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
| * | | | Fix broken ref to IntegrityError | Richard van der Hoff | 2017-11-16 | 1 | -1/+1 | |
| * | | | Avoid locking `pushers` table on upsert | Richard van der Hoff | 2017-11-16 | 1 | -27/+28 | |
| * | | | _simple_upsert: retry on IntegrityError | Richard van der Hoff | 2017-11-16 | 1 | -6/+29 | |
| * | | | Cleanup in _simple_upsert_txn | Richard van der Hoff | 2017-11-16 | 1 | -16/+17 | |
| |/ / | ||||||
| * | | Merge pull request #2661 from matrix-org/rav/statereadstore | Richard van der Hoff | 2017-11-15 | 3 | -249/+237 | |
| |\ \ |