Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 12 | -25/+534 |
|\ | |||||
| * | Update docs | Erik Johnston | 2018-02-13 | 1 | -1/+4 |
| * | Update workers docs to include http port | Erik Johnston | 2018-02-12 | 1 | -5/+20 |
| * | Add note in docs/workers.rst | Erik Johnston | 2018-02-07 | 1 | -0/+11 |
| * | Move presence handling into handle_new_client_event | Erik Johnston | 2018-02-07 | 1 | -6/+6 |
| * | Add event_creator worker | Erik Johnston | 2018-02-07 | 3 | -1/+190 |
| * | Add replication http endpoint for event sending | Erik Johnston | 2018-02-07 | 8 | -13/+304 |
* | | Fix log message in purge_history | Richard van der Hoff | 2018-02-13 | 1 | -2/+1 |
* | | Merge pull request #2864 from matrix-org/rav/persist_event_caching | Richard van der Hoff | 2018-02-13 | 2 | -60/+70 |
|\ \ | |||||
| * | | style nit | Richard van der Hoff | 2018-02-13 | 1 | -1/+1 |
| * | | Use StateResolutionHandler to resolve state in persist events | Richard van der Hoff | 2018-02-05 | 1 | -48/+24 |
| * | | Flatten _get_new_state_after_events | Richard van der Hoff | 2018-02-05 | 1 | -44/+46 |
| * | | Check that events being persisted have state_group | Richard van der Hoff | 2018-02-05 | 1 | -4/+9 |
| * | | Add event_map param to resolve_state_groups | Richard van der Hoff | 2018-02-05 | 2 | -4/+31 |
* | | | Fix typos in purge api & doc | Richard van der Hoff | 2018-02-13 | 2 | -4/+2 |
* | | | Merge pull request #2695 from okurz/feature/allow_recent_pysaml | Richard van der Hoff | 2018-02-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Allow use of higher versions of saml2 | Oliver Kurz | 2017-11-20 | 1 | -1/+1 |
* | | | | Merge pull request #2857 from matrix-org/erikj/upload_store | Erik Johnston | 2018-02-12 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Tell storage providers about new file so they can upload | Erik Johnston | 2018-02-07 | 1 | -0/+6 |
* | | | | | Merge pull request #2858 from matrix-org/rav/purge_updates | Richard van der Hoff | 2018-02-09 | 5 | -41/+100 |
|\ \ \ \ \ | |||||
| * | | | | | purge: move room_depth update to end | Richard van der Hoff | 2018-02-09 | 1 | -6/+12 |
| * | | | | | delete_local_events for purge_history | Richard van der Hoff | 2018-02-09 | 5 | -15/+67 |
| * | | | | | purge: Move cache invalidation to more appropriate place | Richard van der Hoff | 2018-02-09 | 1 | -4/+4 |
| * | | | | | bump purge logging to info | Richard van der Hoff | 2018-02-09 | 1 | -13/+14 |
| * | | | | | rename delete_old_state -> purge_history | Richard van der Hoff | 2018-02-09 | 2 | -8/+8 |
* | | | | | | Merge pull request #2856 from matrix-org/erikj/remove_ratelimit | Erik Johnston | 2018-02-07 | 1 | -5/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | Remove pointless ratelimit check | Erik Johnston | 2018-02-07 | 1 | -5/+0 |
|/ / / / | |||||
* | | | | Merge pull request #2847 from matrix-org/erikj/separate_event_creation | Erik Johnston | 2018-02-06 | 10 | -196/+217 |
|\ \ \ \ | |||||
| * | | | | Update copyright | Erik Johnston | 2018-02-06 | 6 | -1/+6 |
| * | | | | s/_create_new_client_event/create_new_client_event/ | Erik Johnston | 2018-02-06 | 4 | -12/+12 |
| * | | | | Updates tests | Erik Johnston | 2018-02-05 | 2 | -8/+6 |
| * | | | | Update places where we create events | Erik Johnston | 2018-02-05 | 7 | -38/+42 |
| * | | | | Split event creation into a separate handler | Erik Johnston | 2018-02-05 | 1 | -146/+160 |
* | | | | | Store state groups separately from events (#2784) | Erik Johnston | 2018-02-06 | 12 | -189/+326 |
* | | | | | Merge pull request #2849 from matrix-org/rav/clean_up_state_delta | Richard van der Hoff | 2018-02-05 | 1 | -10/+23 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Remove redundant return value from _calculate_state_delta | Richard van der Hoff | 2018-02-05 | 1 | -10/+23 |
* | | | | | Merge pull request #2848 from matrix-org/rav/refactor_search_insert | Richard van der Hoff | 2018-02-05 | 2 | -59/+94 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Factor out common code for search insert | Richard van der Hoff | 2018-02-05 | 1 | -33/+62 |
| * | | | | Move store_event_search_txn to SearchStore | Richard van der Hoff | 2018-02-05 | 2 | -35/+41 |
|/ / / / | |||||
* | | | | Merge pull request #2844 from matrix-org/rav/evicted_metrics | Richard van der Hoff | 2018-02-05 | 5 | -5/+56 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | report metrics on number of cache evictions | Richard van der Hoff | 2018-02-05 | 5 | -5/+56 |
* | | | | Fix broken unit test for media storage | Erik Johnston | 2018-02-05 | 1 | -1/+6 |
* | | | | Add .vscode to gitignore | Erik Johnston | 2018-02-05 | 1 | -0/+2 |
* | | | | Merge pull request #2791 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-02-05 | 6 | -12/+156 |
|\ \ \ \ | |||||
| * | | | | Add unit tests | Erik Johnston | 2018-01-18 | 3 | -0/+109 |
| * | | | | Use better file consumer | Erik Johnston | 2018-01-18 | 1 | -5/+10 |
| * | | | | Ensure media is in local cache before thumbnailing | Erik Johnston | 2018-01-18 | 3 | -10/+40 |
* | | | | | Merge pull request #2845 from matrix-org/rav/urlcache_error_handling | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 5 | -66/+119 |
|\ \ \ \ \ | |||||
| * | | | | | Factor out resolve_state_groups to a separate handler | Richard van der Hoff | 2018-02-01 | 4 | -54/+108 |
| * | | | | | 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 pull request #2818 from turt2live/travis/admin-list-media | Richard van der Hoff | 2018-02-02 | 3 | -56/+142 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'develop' into travis/admin-list-media | Travis Ralston | 2018-02-01 | 47 | -386/+716 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | 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 |
* | | | | | | Script to move remote media to another media store | Richard van der Hoff | 2018-01-31 | 1 | -0/+133 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #2831 from matrix-org/rav/fix-userdir-search-again | Richard van der Hoff | 2018-01-27 | 3 | -7/+96 |
|\ \ \ \ \ | |||||
| * | | | | | Add tests for user directory search | Richard van der Hoff | 2018-01-27 | 2 | -0/+89 |
| * | | | | | Fix SQL for user search | Richard van der Hoff | 2018-01-27 | 1 | -7/+7 |
|/ / / / / | |||||
* | | | | | Merge pull request #2829 from matrix-org/rav/postgres_in_tests | Richard van der Hoff | 2018-01-27 | 2 | -38/+47 |
|\ \ \ \ \ | |||||
| * | | | | | Make it possible to run tests against postgres | Richard van der Hoff | 2018-01-27 | 1 | -9/+34 |
| * | | | | | Create dbpool as normal in tests | Richard van der Hoff | 2018-01-27 | 2 | -45/+19 |
| * | | | | | Run on_new_connection for unit tests | Richard van der Hoff | 2018-01-27 | 1 | -7/+17 |
|/ / / / / | |||||
* | | | | | Merge pull request #2828 from matrix-org/rav/kill_memory_datastore | Richard van der Hoff | 2018-01-27 | 1 | -151/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unused/bitrotted MemoryDataStore | Richard van der Hoff | 2018-01-26 | 1 | -151/+13 |
* | | | | | | 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 |
* | | | | | | Remove spurious unittest.DEBUG | Richard van der Hoff | 2018-01-26 | 1 | -1/+0 |
* | | | | | | 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 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #2821 from matrix-org/rav/matthew_test_fixes | Richard van der Hoff | 2018-01-22 | 1 | -2/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Matthew's fixes to the unit tests | Richard van der Hoff | 2018-01-22 | 1 | -2/+6 |
* | | | | | | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 14 | -7/+146 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid | Matthew Hodgson | 2018-01-22 | 8 | -23/+178 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 |
| * | | | | | mock registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 1 | -0/+1 |
| * | | | | | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 5 | -13/+110 |
| | | * | | | pep8 | Travis Ralston | 2018-01-31 | 1 | -9/+12 |
| | | * | | | Add admin api documentation for list media endpoint | Travis Ralston | 2018-01-31 | 1 | -0/+23 |
| | | * | | | 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 | 2 | -0/+315 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Do logcontexts correctly | Erik Johnston | 2018-01-18 | 1 | -2/+2 |
| * | | | | | Move test stuff to tests | Erik Johnston | 2018-01-18 | 2 | -33/+47 |
| * | | | | | 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 | 2 | -0/+296 |
| |/ / / / | |||||
* | | | | | Fix typo in thumbnail resource causing access times to be incorrect | Erik Johnston | 2018-01-18 | 1 | -2/+2 |
* | | | | | Merge pull request #2810 from matrix-org/rav/metrics_fixes | Richard van der Hoff | 2018-01-18 | 1 | -2/+4 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 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 |
* | | | | | Merge pull request #2802 from matrix-org/rav/clean_up_resolve_events | Richard van der Hoff | 2018-01-17 | 2 | -20/+29 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | 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 | 6 | -31/+49 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | 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 | 7 | -47/+102 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Fix 'NoneType' object has no attribute 'writeHeaders' | Richard van der Hoff | 2018-01-16 | 1 | -9/+9 |
* | | | | | | | | Merge pull request #2794 from matrix-org/rav/rework_run_interaction | Richard van der Hoff | 2018-01-17 | 1 | -20/+31 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'develop' into rav/rework_run_interaction | Richard van der Hoff | 2018-01-17 | 7 | -47/+102 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2792 from matrix-org/rav/optimise_logging_context | Richard van der Hoff | 2018-01-17 | 3 | -22/+33 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | 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 | 3 | -22/+33 |
| |/ / / / |/| | | | | |||||
| | * | | | 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 | 5 | -47/+209 |
|\ \ \ \ | |||||
| * | | | | document metrics changes | Richard van der Hoff | 2018-01-16 | 2 | -8/+58 |
| * | | | | 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 | 9 | -28/+116 |
| |\ \ \ | |||||
| * | | | | 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 |
* | | | | | Merge pull request #2778 from matrix-org/rav/counters_should_be_floats | Richard van der Hoff | 2018-01-15 | 1 | -3/+10 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Make Counter render floats | Richard van der Hoff | 2018-01-12 | 1 | -3/+10 |
|/ / / / | |||||
* | | | | Merge pull request #2777 from matrix-org/rav/fix_remote_thumbnails | Richard van der Hoff | 2018-01-12 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | 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 | 3 | -5/+38 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | 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 | 2 | -8/+33 |
* | | | | 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 | 3 | -1/+49 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse v0.26.0 | Erik Johnston | 2018-01-05 | 77 | -826/+1829 |
| |\ \ \ \ | |||||
| | * | | | | Bump version and changelog release-v0.26.0 | Erik Johnston | 2018-01-05 | 2 | -1/+7 |
| | * | | | | Fix rc version number v0.26.0-rc1 | Erik Johnston | 2017-12-13 | 1 | -2/+2 |
| | * | | | | Bump changelog and version | Erik Johnston | 2017-12-13 | 2 | -1/+38 |
| * | | | | | Merge pull request #2737 from Valodim/master | Matthew Hodgson | 2017-12-17 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | mention federation tester more prominently in the readme | Vincent Breitmoser | 2017-12-16 | 1 | -0/+5 |
| |/ / / / / | |||||
* | | | | | | 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 |
* | | | | | | | Merge pull request #2772 from matrix-org/t3chguy/patch-1 | Erik Johnston | 2018-01-10 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #2764 from matrix-org/erikj/remove_dead_thumbnail_code | Erik Johnston | 2018-01-09 | 2 | -78/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 #2765 from matrix-org/rav/fix_room_uts | Richard van der Hoff | 2018-01-09 | 3 | -4/+9 |
|\ \ \ \ \ | |||||
| * | | | | | enable twisted delayedcall debugging in UTs | Richard van der Hoff | 2018-01-09 | 1 | -1/+5 |
| * | | | | | Remove dead code | Richard van der Hoff | 2018-01-09 | 1 | -3/+0 |
| * | | | | | Disable user_directory updates for UTs | Richard van der Hoff | 2018-01-09 | 1 | -0/+4 |
* | | | | | | Merge pull request #2763 from matrix-org/rav/fix_config_uts | Richard van der Hoff | 2018-01-09 | 2 | -3/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix broken config UTs | Richard van der Hoff | 2018-01-09 | 2 | -3/+18 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #2762 from matrix-org/rav/fix_logconfig_indenting | Richard van der Hoff | 2018-01-09 | 1 | -17/+17 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Make indentation of generated log config consistent | Richard van der Hoff | 2018-01-09 | 1 | -17/+17 |
|/ / / / / | |||||
* | | | | | Merge pull request #2761 from turt2live/patch-1 | Erik Johnston | 2018-01-08 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix templating error with unban permission message | Travis Ralston | 2018-01-07 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #2755 from matrix-org/richvdh-patch-1 | Richard van der Hoff | 2018-01-05 | 1 | -8/+4 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ |