matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\|
*	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
\|\ \| \| \| \|	Ensure media is in local cache before thumbnailing
\| *	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
\| * \|	Handle url_previews with no content-type	Richard van der Hoff	2018-02-02	1	-21/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	avoid failing with an exception if the remote server doesn't give us a Content-Type header. Also, clean up the exception handling a bit.
* \| \|	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
\| * \| \|	Factor out resolve_state_groups to a separate handler	Richard van der Hoff	2018-02-01	4	-54/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We extract the storage-independent bits of the state group resolution out to a separate functiom, and stick it in a new handler, in preparation for its use from the storage layer.
\| * \| \|	Rename resolve_state_groups -> resolve_state_groups_for_events	Richard van der Hoff	2018-02-01	2	-12/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(to make way for a method that actually just does the state group resolution)
* \| \| \|	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
\| * \| \| \|	factor _get_new_state_after_events out of _calculate_state_delta	Richard van der Hoff	2018-01-31	1	-18/+39
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	This reduces the scope of a bunch of variables
* \| \| \|	Merge pull request #2836 from matrix-org/rav/resolve_state_events_docstring	Richard van der Hoff	2018-02-02	1	-8/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Docstring fixes
\| * \| \| \|	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 a couple of errors in docstrings
\| * \| \| \|	Fix docstring for StateHandler.resolve_state_groups	Richard van der Hoff	2018-02-01	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The return type was a complete lie, so fix it
* \| \| \| \|	Merge pull request #2818 from turt2live/travis/admin-list-media	Richard van der Hoff	2018-02-02	3	-56/+142
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Add an admin route to get all the media in a room
\| * \| \| \|	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
\| * \| \| \|	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
\| * \| \| \|	Remove spurious log argument	Richard van der Hoff	2018-01-30	1	-2/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	... which would cause scary-looking and unhelpful errors in the log on dns fail
* \| \| \|	Merge pull request #2835 from matrix-org/rav/remove_event_type_param	Richard van der Hoff	2018-01-31	1	-6/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove unused "event_type" param on state.get_current_state_ids
\| * \| \| \|	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
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this param doesn't seem to be used, and is a bit pointless anyway because it can easily be replicated by the caller. It is also horrible, because it changes the return type of the method.
* \| \| \|	Merge pull request #2834 from ↵	Richard van der Hoff	2018-01-31	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/rav/better_persist_event_exception_handling Improve exception handling in persist_event
\| * \| \| \|	Improve exception handling in persist_event	Richard van der Hoff	2018-01-29	1	-3/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. use `deferred.errback()` instead of `deferred.errback(e)`, which means that a Failure object will be constructed using the current exception state, including its stack trace - so the stack trace is saved in the Failure, leading to better exception reports. 2. Set `consumeErrors=True` on the ObservableDeferred, because we know that there will always be at least one observer - which avoids a spurious "CRITICAL: unhandled exception in Deferred" error in the logs
* \| \| \|	Merge pull request #2833 from matrix-org/rav/pusher_hacks	Richard van der Hoff	2018-01-31	1	-7/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Logging and metrics for the http pusher
\| * \| \| \|	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
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use a connection pool for the SimpleHttpClient
\| * \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In particular I hope this will help the pusher, which makes many requests to sygnal, and is currently negotiating SSL for each one.
* \| \| \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix SQL for user search
\| * \| \| \|	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
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix some syntax errors for user search when search_all_users is enabled fixes #2801, hopefully
* \| \| \|	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
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... instead of creating our own special SQLiteMemoryDbPool, whose purpose was a bit of a mystery. For some reason this makes one of the tests run slightly slower, so bump the sleep(). Sorry.
\| * \| \| \|	Run on_new_connection for unit tests	Richard van der Hoff	2018-01-27	1	-7/+17
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Configure the connectionpool used for unit tests to run the `on_new_connection` function.
* \| \| \|	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
\| * \| \| \|	Remove unused/bitrotted MemoryDataStore	Richard van der Hoff	2018-01-26	1	-151/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This isn't used, and looks thoroughly bitrotted.
* \| \| \| \|	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
\| * \| \| \| \|	Factor out get_db_conn to HomeServer base class	Richard van der Hoff	2018-01-26	11	-130/+17
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This function is identical to all subclasses, so we may as well push it up to the base class to reduce duplication (and make use of it in the tests)
* \| \| \| \|	Merge pull request #2827 from ↵	Neil Johnson	2018-01-26	1	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/fix_server_500_on_public_rooms_call_when_no_rooms_exist Fix server 500 on public rooms call when no rooms exist
\| * \| \| \|	add white space line	Neil Johnson	2018-01-26	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	rather than try reconstruct the results object, better to guard against the ↵	Neil Johnson	2018-01-26	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	xrange step argument being 0
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rooms is zero, the specific cause is due to xrange trying to use a step value of zero, but if the total room number really is zero then it makes sense to just bail and save the extra processing
* \| \| \| \|	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
\| * \| \| \| \|	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
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \|	blindly implement ?ts for AS. untested
* \| \| \| \|	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
\| * \| \| \| \|	Matthew's fixes to the unit tests	Richard van der Hoff	2018-01-22	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extracted from https://github.com/matrix-org/synapse/pull/2820
* \| \| \| \| \|	Add federation_domain_whitelist option (#2820)	Matthew Hodgson	2018-01-22	14	-7/+146
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add federation_domain_whitelist gives a way to restrict which domains your HS is allowed to federate with. useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network
* \| \| \| \|	Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid	Matthew Hodgson	2018-01-22	8	-23/+178
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	add registrations_require_3pid and allow_local_3pids
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* [ ] split config options into allowed_local_3pids and registrations_require_3pid * [ ] simplify and comment logic for picking registration flows * [ ] fix docstring and move check_3pid_allowed into a new util module * [ ] use check_3pid_allowed everywhere @erikjohnston PTAL
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lets homeservers specify a whitelist for 3PIDs that users are allowed to associate with. Typically useful for stopping people from registering with non-work emails
\| \| \| * \|	pep8	Travis Ralston	2018-01-31	1	-9/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
\| \| \| * \|	Add admin api documentation for list media endpoint	Travis Ralston	2018-01-31	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
\| \| \| * \|	Documentation and naming	Travis Ralston	2018-01-31	1	-7/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
\| \| \| * \|	Appease the linter	Travis Ralston	2018-01-20	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are ids anyways, not mxc uris. Signed-off-by: Travis Ralston <travpc@gmail.com>
\| \| \| * \|	Add an admin route to get all the media in a room	Travis Ralston	2018-01-20	2	-56/+97
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is intended to be used by administrators to monitor the media that is passing through their server, if they wish. Signed-off-by: Travis Ralston <travpc@gmail.com>
* \| \| \|	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
\| * \| \| \|	Use the right path for url_preview thumbnails	Richard van der Hoff	2018-01-19	1	-0/+8
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was introduced by #2627: we were overwriting the original media for url previews with the thumbnails :/ (fixes https://github.com/vector-im/riot-web/issues/6012, hopefully)
* \| \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Make storage providers configurable
\| * \| \| \|	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
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|	Add decent impl of a FileConsumer
\| * \| \| \|	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
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Twisted core doesn't have a general purpose one, so we need to write one ourselves. Features: - All writing happens in background thread - Supports both push and pull producers - Push producers get paused if the consumer falls behind
* \| \| \|	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
\| * \| \|	Fix bugs in block metrics	Richard van der Hoff	2018-01-18	1	-2/+4
\|/ / / \| \| \| \| \| \| \| \| \|	... which I introduced in #2785
* \| \|	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
\| * \|	better exception logging in callbackmetrics	Richard van der Hoff	2018-01-18	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \|	when we fail to render a metric, give a clue as to which metric it was
* \| \|	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
\| * \|	Log room when doing state resolution	Richard van der Hoff	2018-01-17	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Mostly because it helps figure out what is prompting the resolution
* \| \|	Merge pull request #2783 from matrix-org/erikj/media_last_accessed	Erik Johnston	2018-01-17	5	-11/+64
\|\ \ \ \| \| \| \| \| \| \| \|	Keep track of last access time for local media
\| * \| \|	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
\| * \| \|	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
\| * \| \|	Split resolve_events into two functions	Richard van der Hoff	2018-01-17	2	-20/+29
\|/ / / \| \| \| \| \| \| \| \| \|	... so that the return type doesn't depend on the arg types
* \| \|	Merge pull request #2795 from matrix-org/rav/track_db_scheduling	Richard van der Hoff	2018-01-17	5	-4/+43
\|\ \ \ \| \| \| \| \| \| \| \|	Track DB scheduling delay per-request
\| * \ \	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For each request, track the amount of time spent waiting for a db connection. This entails adding it to the LoggingContext and we may as well add metrics for it while we are passing.
\| * \| \| \|	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
\| * \| \| \| \|	Sanity checking for user ids	Richard van der Hoff	2018-01-17	2	-8/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check the user_id passed to a couple of APIs for validity, to avoid "IndexError: list index out of range" exception which looks scary and results in a 500 rather than a more useful error. Fixes #1432, among other things
* \| \| \| \| \|	Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millis	Richard van der Hoff	2018-01-17	4	-10/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Track db txn time in millisecs
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... to reduce the amount of floating-point foo we do.
* \| \| \| \| \|	Merge pull request #2796 from matrix-org/rav/fix_closed_connection_errors	Richard van der Hoff	2018-01-17	1	-9/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'NoneType' object has no attribute 'writeHeaders'
\| * \ \ \ \ \	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid throwing a (harmless) exception when we try to write an error response to an http request where the client has disconnected. This comes up as a CRITICAL error in the logs which tends to mislead people into thinking there's an actual problem
* \| \| \| \| \| \|	Merge pull request #2794 from matrix-org/rav/rework_run_interaction	Richard van der Hoff	2018-01-17	1	-20/+31
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	rework runInteraction in terms of runConnection
\| * \| \| \| \| \|	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
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	Optimise LoggingContext creation and copying
\| * \| \| \| \|	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
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix thumbnailing remote files
\| * \| \| \| \|	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
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It turns out that the only thing we use the __dict__ of LoggingContext for is `request`, and given we create lots of LoggingContexts and then copy them every time we do a db transaction or log line, using the __dict__ seems a bit redundant. Let's try to optimise things by making the request attribute explicit.
\| \| * \|	rework runInteraction in terms of runConnection	Richard van der Hoff	2018-01-16	1	-20/+31
\| \|/ / \|/\| \| \| \| \| \| \| \|	... so that we can share the code
* \| \|	Merge pull request #2785 from matrix-org/rav/reorganise_metrics_again	Richard van der Hoff	2018-01-16	5	-47/+209
\|\ \ \ \| \| \| \| \| \| \| \|	Reorganise request and block metrics
\| * \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to circumvent the number of duplicate foo:count metrics increasing without bounds, it's time for a rearrangement. The following are all deprecated, and replaced with synapse_util_metrics_block_count: synapse_util_metrics_block_timer:count synapse_util_metrics_block_ru_utime:count synapse_util_metrics_block_ru_stime:count synapse_util_metrics_block_db_txn_count:count synapse_util_metrics_block_db_txn_duration:count The following are all deprecated, and replaced with synapse_http_server_response_count: synapse_http_server_requests synapse_http_server_response_time:count synapse_http_server_response_ru_utime:count synapse_http_server_response_ru_stime:count synapse_http_server_response_db_txn_count:count synapse_http_server_response_db_txn_duration:count The following are renamed (the old metrics are kept for now, but deprecated): synapse_util_metrics_block_timer:total -> synapse_util_metrics_block_time_seconds synapse_util_metrics_block_ru_utime:total -> synapse_util_metrics_block_ru_utime_seconds synapse_util_metrics_block_ru_stime:total -> synapse_util_metrics_block_ru_stime_seconds synapse_util_metrics_block_db_txn_count:total -> synapse_util_metrics_block_db_txn_count synapse_util_metrics_block_db_txn_duration:total -> synapse_util_metrics_block_db_txn_duration_seconds synapse_http_server_response_time:total -> synapse_http_server_response_time_seconds synapse_http_server_response_ru_utime:total -> synapse_http_server_response_ru_utime_seconds synapse_http_server_response_ru_stime:total -> synapse_http_server_response_ru_stime_seconds synapse_http_server_response_db_txn_count:total -> synapse_http_server_response_db_txn_count synapse_http_server_response_db_txn_duration:total synapse_http_server_response_db_txn_duration_seconds
\| * \| \|	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
\| * \| \| \|	Fix a logcontext leak in persist_events	Richard van der Hoff	2018-01-16	1	-1/+8
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ObserveableDeferred expects its callbacks to be called without any logcontexts, whereas it turns out we were calling them with the logcontext of the request which initiated the persistence loop. It seems wrong that we are attributing work done in the persistence loop to the request that happened to initiate it, so let's solve this by dropping the logcontext for it. (I'm not sure this actually causes any real problems other than messages in the debug log, but let's clean it up anyway)
* \| \| \|	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
\| * \| \| \|	Metrics for events processed in appservice and fed sender	Richard van der Hoff	2018-01-15	2	-0/+11
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	More metrics I wished I'd had
* \| \| \|	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
\| * \| \|	Metrics for number of RDATA commands received	Richard van der Hoff	2018-01-15	1	-5/+14
\| \|/ / \| \| \| \| \| \| \| \| \|	I found myself wishing we had this.
* \| \|	Merge pull request #2767 from matrix-org/erikj/media_storage_refactor	Erik Johnston	2018-01-16	7	-346/+843
\|\ \ \ \| \|/ / \|/\| \|	Refactor MediaRepository to separate out storage
\| * \|	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 ↵	Erik Johnston	2018-01-12	9	-28/+116
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	erikj/media_storage_refactor
\| * \| \|	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
\| * \| \|	Make Counter render floats	Richard van der Hoff	2018-01-12	1	-3/+10
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prometheus handles all metrics as floats, and sometimes we store non-integer values in them (notably, durations in seconds), so let's render them as floats too. (Note that the standard client libraries also treat Counters as floats.)
* \| \|	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
\| * \| \|	Reinstate media download on thumbnail request	Richard van der Hoff	2018-01-12	1	-0/+5
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	We need to actually download the remote media when we get a request for a thumbnail.
* \| \|	Merge pull request #2774 from matrix-org/erikj/synctl	Erik Johnston	2018-01-12	3	-5/+38
\|\ \ \ \| \|_\|/ \|/\| \|	When using synctl with workers, don't start the main synapse automatically
\| * \|	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
\| * \|	Add /room/{id}/event/{id} to synapse	Richard van der Hoff	2018-01-09	1	-3/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out that there is a valid usecase for retrieving event by id (notably having received a push), but event ids should be scoped to room, so /event/{id} is wrong.
* \| \|	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 github/release-v0.26.0 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
\| \| * \| \| \|	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
\| * \| \| \| \|	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 publicised groups GET API (singular) over federation
\| * \| \| \| \| \|	fix order of operations derp and also use `.get` to default to {}	Michael Telatynski	2018-01-10	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
\| * \| \| \| \| \|	Fix publicised groups API (singular) over federation	Michael Telatynski	2018-01-10	1	-4/+4
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	which was missing its fed client API, since there is no other API it might as well reuse the bulk one and unwrap it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* \| \| \| \| \|	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
\| * \| \| \| \|	Update http request metrics before calling servlet	Richard van der Hoff	2018-01-09	1	-11/+19
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that we set the servlet name in the metrics object before calling the servlet, in case the servlet throws an exception.
* \| \| \| \|	Merge pull request #2764 from matrix-org/erikj/remove_dead_thumbnail_code	Erik Johnston	2018-01-09	2	-78/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Remove dead code related to default thumbnails
\| * \| \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix flaky test_rooms UTs
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pointless function is pointless
\| * \| \| \|	Disable user_directory updates for UTs	Richard van der Hoff	2018-01-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix flakiness in the UTs caused by the user_directory being updated in the background
* \| \| \| \|	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
\| * \| \| \| \|	Fix broken config UTs	Richard van der Hoff	2018-01-09	2	-3/+18
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/matrix-org/synapse/pull/2755 broke log-config generation, which in turn broke the unit tests.
* \| \| \| \|	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
\| * \| \| \|	Make indentation of generated log config consistent	Richard van der Hoff	2018-01-09	1	-17/+17
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	(we had a mix of 2- and 4-space indents)
* \| \| \|	Merge pull request #2761 from turt2live/patch-1	Erik Johnston	2018-01-08	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix templating error with unban permission message
\| * \| \| \|	Fix templating error with unban permission message	Travis Ralston	2018-01-07	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/matrix-org/synapse/issues/2759 Signed-off-by: Travis Ralston <travpc@gmail.com>
* \| \| \|	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
\| * \| \| \|	Remove 'verbosity'/'log_file' from generated cfg	Richard van der Hoff	2018-01-05	1	-8/+4
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... because these only really exist to confuse people nowadays. Also bring log config more into line with the generated log config, by making `level_for_storage` apply to the `synapse.storage.SQL` logger rather than `synapse.storage`.
* \| \| \|	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
\| * \| \| \|	Better logging when login can't find a 3pid	Richard van der Hoff	2017-12-20	1	-4/+10
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2745 from matrix-org/rav/assert_params	Richard van der Hoff	2018-01-05	3	-60/+68
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Check missing fields in event_from_pdu_json
\| * \| \| \|	Check missing fields in event_from_pdu_json	Richard van der Hoff	2017-12-30	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return a 400 rather than a 500 when somebody messes up their send_join
\| * \| \| \|	Factor out `event_from_pdu_json`	Richard van der Hoff	2017-12-30	3	-37/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	turns out we have two copies of this, and neither needs to be an instance method
\| * \| \| \|	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
\| * \| \| \|	synapse/config/password_auth_providers: Fixed bracket typo	Richard von Seck	2017-11-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Richard von Seck <richard.von-seck@gmx.net>
* \| \| \| \|	Merge pull request #2435 from silkeh/listen-ipv6-default	Richard van der Hoff	2017-12-18	12	-231/+247
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Adapt the default config to bind on both IPv4 and IPv6 on all platforms
\| * \| \| \|	Implement listen_tcp method in remaining workers	Silke	2017-12-18	10	-192/+155
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Silke <silke@slxh.eu>
\| * \| \| \|	Remove logger argument and do not catch replication listener	Silke	2017-12-18	2	-24/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Silke <silke@slxh.eu>
\| * \| \| \|	Add methods for listening on multiple addresses	Silke Hofstra	2017-12-17	2	-51/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP and reactor.listenSSL for multiple addresses. Signed-off-by: Silke Hofstra <silke@slxh.eu>
\| * \| \| \|	Allow binds to both :: and 0.0.0.0	Silke Hofstra	2017-12-17	2	-42/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed. This causes a warning explaining the behaviour. Configuration changed to match. See #2232 Signed-off-by: Silke Hofstra <silke@slxh.eu>
\| * \| \| \|	Adapt the default config to bind on IPv6.	Willem Mulder	2017-12-17	1	-8/+9
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most deployments are on Linux (or Mac OS), so this would actually bind on both IPv4 and IPv6. Resolves #1886. Signed-off-by: Willem Mulder <willemmaster@hotmail.com>
* \| \| \|	Merge pull request #2717 from matrix-org/erikj/createroom_content	Erik Johnston	2017-12-07	2	-5/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix wrong avatars when inviting multiple users when creating room
\| * \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2017-12-07	73	-820/+1776
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \|	erikj/createroom_content
* \| \| \| \|	Merge pull request #2723 from matrix-org/matthew/search-all-local-users	Matthew Hodgson	2017-12-05	11	-37/+234
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add all local users to the user_directory and optionally search them
\| * \| \| \| \|	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
\| \| \| \| \| \|
\| * \| \| \| \|	try make tests work a bit more...	Matthew Hodgson	2017-12-04	1	-0/+12
\| \| \| \| \| \|
\| * \| \| \| \|	erik told me to	Matthew Hodgson	2017-12-04	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	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	32	-200/+633
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	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 ↵	Matthew Hodgson	2017-11-29	5	-9/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	additional users Initial commit; this doesn't work yet - the LIKE filtering seems too aggressive. It also needs _do_initial_spam to be aware of prepopulating the whole user_directory_search table with all users... ...and it needs a handle_user_signup() or something to be added so that new signups get incrementally added to the table too. Committing it here as a WIP
* \| \| \| \| \|	Fix error when deleting devices	Richard van der Hoff	2017-12-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was introduced in d7ea8c4 / PR #2728
* \| \| \| \| \|	Merge pull request #2729 from matrix-org/rav/custom_ui_auth	Richard van der Hoff	2017-12-05	1	-24/+57
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	support custom login types for validating users
\| * \| \| \| \| \|	support custom login types for validating users	Richard van der Hoff	2017-12-05	1	-24/+57
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wire the custom login type support from password providers into the UI-auth user-validation flows.
* \| \| \| \| \|	Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_auth	Richard van der Hoff	2017-12-05	3	-74/+102
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Factor out a validate_user_via_ui_auth method
\| * \| \| \| \| \|	Factor out a validate_user_via_ui_auth method	Richard van der Hoff	2017-12-05	3	-74/+102
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Collect together all the places that validate a logged-in user via UI auth.
* \| \| \| \| \|	Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_return	Richard van der Hoff	2017-12-05	7	-48/+103
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor UI auth implementation
\| * \| \| \| \| \|	Refactor UI auth implementation	Richard van der Hoff	2017-12-05	7	-48/+103
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper.