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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update sumperdump Docker readme to match this image properties	kaiyou	2018-02-04	1	-38/+64
\|
*	Remove etc/service files from rob's branch	kaiyou	2018-02-04	3	-131/+0
\|
*	Merge remote-tracking branch 'origin/rob/docker' into feat-dockerfile	kaiyou	2018-02-04	4	-0/+201
\|\
\| *	docker: s/matrix-org/matrixdotorg/g	Robert Swain	2017-09-29	2	-5/+5
\| \|
\| *	docker: Initial Dockerfile and docker-compose.yaml	Robert Swain	2017-09-28	5	-0/+259
\| \|
* \|	Reuse environment variables of the postgres container	kaiyou	2018-02-04	2	-9/+14
\| \|
* \|	Provide an example docker compose file	kaiyou	2018-02-04	2	-0/+34
\| \|
* \|	Install the postgres dependencies	kaiyou	2018-02-04	1	-2/+2
\| \|
* \|	Support an external postgresql config in the Docker image	kaiyou	2018-02-04	1	-2/+11
\| \|
* \|	Generate shared secrets if not defined in the environment	kaiyou	2018-02-04	1	-4/+11
\| \|
* \|	Generate any missing keys before starting synapse	kaiyou	2018-02-04	1	-12/+13
\| \|
* \|	Allow for a wheel cache and include missing files in the build	kaiyou	2018-02-04	3	-6/+13
\| \|
* \|	Add template config files for the Docker image	kaiyou	2018-02-03	2	-0/+217
\| \|
* \|	Initial commit including a Dockerfile for synapse	kaiyou	2018-02-03	2	-0/+45
\| \|
* \|	Merge pull request #2798 from jeremycline/fedora-repo	Erik Johnston	2018-01-17	1	-0/+4
\|\ \ \| \| \| \| \| \|	Note that Synapse is available in Fedora
\| * \|	Note that Synapse is available in Fedora	Jeremy Cline	2018-01-16	1	-0/+4
\|/ / \| \| \| \| \| \|	Signed-off-by: Jeremy Cline <jeremy@jcline.org>
* \|	Merge pull request #2674 from her001/readme-sytest	Richard van der Hoff	2018-01-16	1	-0/+11
\|\ \ \| \| \| \| \| \|	Mention SyTest in the README, after Development
\| * \|	Mention SyTest in the README, after Development	Andrew Conrad	2017-11-14	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Andrew Conrad <aconrad103@gmail.com>
* \| \|	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 #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.
\| * \| \| \| \| \|	Merge pull request #2716 from matrix-org/rav/federation_client_post	Richard van der Hoff	2017-12-04	1	-8/+34
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	federation_client script: Support for posting content
\| \| * \| \| \| \|	federation_client script: Support for posting content	Richard van der Hoff	2017-11-28	1	-8/+34
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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
\| \| * \| \| \| \| \|	Improve comments on get_user_by_access_token	Richard van der Hoff	2017-11-29	1	-1/+5
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	because I have to reverse-engineer this every time.
\| * \| \| \| \| \|	Merge pull request #2722 from matrix-org/rav/delete_device_on_logout	Richard van der Hoff	2017-11-29	12	-64/+226
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete devices and pushers on logouts etc
\| \| * \| \| \| \| \|	Delete devices in various logout situations	Richard van der Hoff	2017-11-29	5	-5/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that we delete devices whenever a user is logged out due to any of the following situations: * /logout * /logout_all * change password * deactivate account (by the user or by an admin) * invalidate access token from a dynamic module Fixes #2672.
\| \| * \| \| \| \| \|	Move set_password into its own handler	Richard van der Hoff	2017-11-29	6	-19/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Non-functional refactoring to move set_password. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop.
\| \| * \| \| \| \| \|	Move deactivate_account into its own handler	Richard van der Hoff	2017-11-29	6	-22/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Non-functional refactoring to move deactivate_account. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop.
\| \| * \| \| \| \| \|	Remove pushers when deleting access tokens	Richard van der Hoff	2017-11-29	3	-18/+32
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Whenever an access token is invalidated, we should remove the associated pushers.
\| * \| \| \| \| \|	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
\| \| * \| \| \| \| \|	Clear logcontext before starting fed txn queue runner	Richard van der Hoff	2017-11-28	2	-9/+18
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These processes take a long time compared to the request, so there is lots of "Entering\|Restoring dead context" in the logs. Let's try to shut it up a bit.
\| * \| \| \| \| \|	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
\| \| * \| \| \| \| \|	Fix 500 when joining matrix-dev	Richard van der Hoff	2017-11-29	1	-3/+10
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-dev has an event (`$/6ANj/9QWQyd71N6DpRQPf+SDUu11+HVMeKSpMzBCwM:zemos.net`) which has no `hashes` member. Check for missing `hashes` element in events.
\| * \| \| \| \| \|	Merge pull request #2715 from matrix-org/luke/group-guest-access	Luke Barnard	2017-11-28	1	-11/+11
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Allow guest access to group APIs for reading
\| \| * \| \| \| \|	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 error on sqlite 3.7
\| \| * \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	so that the right thing happens on workers.
\| \| * \| \| \| \|	Fix error on sqlite 3.7	Richard van der Hoff	2017-11-21	5	-8/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create the url_cache index on local_media_repository as a background update, so that we can detect whether we are on sqlite or not and create a partial or complete index accordingly. To avoid running the cleanup job before we have built the index, add a bailout which will defer the cleanup if the bg updates are still running. Fixes https://github.com/matrix-org/synapse/issues/2572.
\| * \| \| \| \| \|	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
\| \| * \| \| \| \| \|	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
\| \| * \| \| \| \| \| \|	Fix error handling on dns lookup	Richard van der Hoff	2017-11-24	1	-2/+4
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pass the right arguments to the errback handler Fixes "TypeError('eb() takes exactly 2 arguments (1 given)',)"
\| * \| \| \| \| \| \|	Merge pull request #2710 from matrix-org/rav/remove_dead_code	Richard van der Hoff	2017-11-27	1	-2/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tiny code cleanups
\| \| * \| \| \| \| \| \|	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
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is never used; let's remove it to stop confusing things.
\| * \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \|	Fix some logcontext leaks in replication resource	Richard van der Hoff	2017-11-23	1	-2/+4
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The @measure_func annotations rely on the wrapped function respecting the logcontext rules. Add the necessary yields to make this work.
\| * \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \|	Fix OPTIONS on preview_url	Richard van der Hoff	2017-11-23	1	-1/+5
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2706
\| * \| \| \| \| \| \|	Merge pull request #2705 from matrix-org/rav/improve_tracebacks	Richard van der Hoff	2017-11-27	1	-3/+9
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|	Improve tracebacks on exceptions
\| \| * \| \| \| \| \|	Improve tracebacks on exceptions	Richard van der Hoff	2017-11-27	1	-3/+9
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use failure.Failure to recover our failure, which will give us a useful stacktrace, unlike the rethrown exception.
\| * \| \| \| \| \|	Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_all	Richard van der Hoff	2017-11-22	6	-13/+48
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try to avoid having multiple PreviewUrlResource instances
\| \| * \| \| \| \| \|	Add config option to disable media_repo on main synapse	Richard van der Hoff	2017-11-22	4	-9/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... to stop us doing the cache cleanup jobs on the master.
\| \| * \| \| \| \| \|	Build MediaRepositoryResource as a homeserver dependency	Richard van der Hoff	2017-11-22	4	-5/+19
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids the scenario where we have four different PreviewUrlResources configured on a single app, each of which have their own caches and cache clearing jobs.
\| * \| \| \| \| \|	Merge pull request #2700 from matrix-org/rav/worker_docs	Richard van der Hoff	2017-11-21	1	-21/+133
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Improve documentation of workers Fixes https://github.com/matrix-org/synapse/issues/2554
\| \| * \| \| \| \| \|	Improve documentation of workers	Richard van der Hoff	2017-11-21	1	-21/+133
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/matrix-org/synapse/issues/2554
\| * \| \| \| \| \|	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
\| \| * \| \| \| \| \|	Clean up dependency list	Richard van der Hoff	2017-11-21	1	-16/+15
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove those that aren't used at all, and replace the ones that don't have builders with simple getters rather than dynamically-generated methods.
\| * \| \| \| \| \|	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
\| \| * \| \| \| \|	Avoid locking account_data tables for upserts	Richard van der Hoff	2017-11-16	1	-36/+49
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	sanity checks	Matthew Hodgson	2017-11-21	1	-1/+4
\| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	don't double-invite in sync_room_to_group.pl	Matthew Hodgson	2017-11-19	1	-3/+6
\| \| \| \| \| \|
\| * \| \| \| \|	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
\| \| * \| \| \| \|	Avoid locking for upsert on pushers tables	Richard van der Hoff	2017-11-16	2	-5/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* replace the upsert into deleted_pushers with an insert * no need to lock for upsert on pusher_throttle
\| * \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2017-11-17	2	-1/+9
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge pull request #2686 from matrix-org/luke/as-flair	Luke Barnard	2017-11-17	4	-1/+49
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add automagical AS Publicised Group(s)
\| \| * \| \| \| \| \| \|	Add extra space before inline comment	Luke Barnard	2017-11-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Extract group_id from the dict for multiple use	Luke Barnard	2017-11-16	1	-4/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix tests	Luke Barnard	2017-11-16	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	via registration file "users" namespace: ```YAML ... namespaces: users: - exclusive: true regex: '.luke.' group_id: '+all_the_lukes:hsdomain' ... ``` This is part of giving App Services their own groups for matching users. With this, ghost users will be given the appeareance that they are in a group and that they have publicised the fact, but _only_ from the perspective of the `get_publicised_groups_for_user` API.
\| * \| \| \| \| \| \| \|	typo	Matthew Hodgson	2017-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	quick and dirty room membership<->group membership sync script	Matthew Hodgson	2017-11-17	1	-0/+39
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix auth handler #2678	Jurek	2017-11-16	1	-1/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #2684 from matrix-org/rav/unlock_upsert	Richard van der Hoff	2017-11-16	2	-49/+74
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Start work on avoiding table locks for upserts
\| \| * \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that _simple_upsert will retry on IntegrityError, we don't need to lock the table.
\| \| * \| \| \| \|	_simple_upsert: retry on IntegrityError	Richard van der Hoff	2017-11-16	1	-6/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wrap the call to _simple_upsert_txn in a loop so that we retry on an integrityerror: this means we can avoid locking the table provided there is an unique index.
\| \| * \| \| \| \|	Cleanup in _simple_upsert_txn	Richard van der Hoff	2017-11-16	1	-16/+17
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bail out early to reduce indentation
\| * \| \| \| \|	Merge pull request #2661 from matrix-org/rav/statereadstore	Richard van der Hoff	2017-11-15	3	-249/+237
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull out bits of StateStore to a mixin
\| \| * \| \| \| \|	Pull out bits of StateStore to a mixin	Richard van der Hoff	2017-11-14	2	-237/+226
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... so that we don't need to secretly gut-wrench it for use in the slaved stores. I haven't done the other stores yet, but we should. I'm tired of the workers breaking every time we tweak the stores because I forgot to gut-wrench the right method. fixes https://github.com/matrix-org/synapse/issues/2655.
\| \| * \| \| \| \|	Revert "Revert "move _state_group_cache to statestore""	Richard van der Hoff	2017-11-14	2	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're going to fix this properly on this branch, so that the _state_group_cache can end up in StateGroupReadStore. This reverts commit ab335edb023d66cd0be439e045b10ca104b73cb5.
\| * \| \| \| \| \|	Merge pull request #2677 from matrix-org/rav/spec_r0.3.0	Richard van der Hoff	2017-11-15	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Declare support for r0.3.0
\| \| * \| \| \| \| \|	Declare support for r0.3.0	Richard van der Hoff	2017-11-15	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-11-15	1	-0/+8
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs	Richard van der Hoff	2017-11-15	10	-96/+23
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove preserve_context_over_{fn, deferred}
\| \| * \| \| \| \| \| \|	Remove __PreservingContextDeferred too	Richard van der Hoff	2017-11-14	1	-30/+0
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Remove preserve_context_over_{fn, deferred}	Richard van der Hoff	2017-11-14	10	-66/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Both of these functions ae known to leak logcontexts. Replace the remaining calls to them and kill them off.
\| * \| \| \| \| \| \| \|	Merge pull request #2650 from matrix-org/dbkr/push_include_content_option	David Baker	2017-11-15	2	-15/+32
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename redact_content option to include_content
\| \| * \| \| \| \| \| \| \|	Print instead of logging	David Baker	2017-11-13	1	-11/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	because we had to wait until the logger was set up
\| \| * \| \| \| \| \| \| \|	Make the commented config have the default	David Baker	2017-11-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	better comments	David Baker	2017-11-08	1	-2/+5
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Log if any of the old config flags are set	David Baker	2017-11-08	1	-2/+24
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Rename redact_content option to include_content	David Baker	2017-11-08	2	-16/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The redact_content option never worked because it read the wrong config section. The PR introducing it (https://github.com/matrix-org/synapse/pull/2301) had feedback suggesting the name be changed to not re-use the term 'redact' but this wasn't incorporated. This reanmes the option to give it a less confusing name, and also means that people who've set the redact_content option won't suddenly see a behaviour change when upgrading synapse, but instead can set include_content if they want to. This PR also updates the wording of the config comment to clarify that this has no effect on event_id_only push. Includes https://github.com/matrix-org/synapse/pull/2422
\| * \| \| \| \| \| \| \| \|	Merge pull request #2648 from krombel/update_prometheus	Richard van der Hoff	2017-11-14	3	-1/+78
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update prometheus-config to new format
\| \| * \| \| \| \| \| \| \| \|	Make clear that the config has changed since prometheus v2	Krombel	2017-11-14	3	-2/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This restores the config that is usable for prometheus pre v2.0.0 The new config only works for Prometheus v2+
\| \| * \| \| \| \| \| \| \| \|	update prometheus-config to new format	Krombel	2017-11-07	2	-23/+67
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #2671 from matrix-org/rav/room_list_fixes	Richard van der Hoff	2017-11-14	1	-20/+30
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reshuffle room list request code
\| \| * \| \| \| \| \| \| \| \| \|	Reshuffle room list request code	Richard van der Hoff	2017-11-14	1	-27/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm not entirely sure if this will actually help anything, but it simplifies the code and might give further clues about why room list search requests are blowing out the get_current_state_ids caches.
\| \| * \| \| \| \| \| \| \| \| \|	Add a load of logging to the room_list handler	Richard van der Hoff	2017-11-14	1	-0/+13
\| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So we can see what it gets up to.
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #2673 from matrix-org/erikj/fix_port_script_groups	Richard van der Hoff	2017-11-14	1	-0/+7
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new boolean columns to port script
\| \| \| \| \| \| \| \| \| * \| \|	Copy dict in update_membership too	Erik Johnston	2017-12-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \| \|	PEP8	Erik Johnston	2017-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \| \|	Fix wrong avatars when inviting multiple users when creating room	Erik Johnston	2017-11-28	1	-5/+5
\| \| \| \| \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We reused the `content` dictionary between invite requests, which meant they could end up reusing the profile info for a previous user
* \| \| \| \| \| \| \| \| \| \|	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 branch 'release-v0.25.1'	Richard van der Hoff	2017-11-17	3	-2/+10
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Bump version in __init__.py v0.25.1 github/release-v0.25.1 release-v0.25.1	Richard van der Hoff	2017-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Prep changelog for v0.25.1	Richard van der Hoff	2017-11-17	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix auth handler #2678	Jurek	2017-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #2679 from jkolo/fix_auth_handler"	Richard van der Hoff	2017-11-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This PR was against master, not develop :( This reverts commit 203058a027193b6a07a148319a9a728bf7f8420c, reversing changes made to 552f123bea1014680ab798b7e34cd1b23424a189.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2679 from jkolo/fix_auth_handler	Richard van der Hoff	2017-11-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \|	Fix auth handler
\| * \| \| \| \| \| \| \| \| \|	Fix auth handler #2678	Jurek	2017-11-15	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| / /	Merge branch 'release-v0.25.0' of github.com:matrix-org/synapse v0.25.0	Erik Johnston	2017-11-15	85	-689/+1783
\|\\| \| \| \| \| \| \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Bump changelog github/release-v0.25.0 release-v0.25.0	Erik Johnston	2017-11-15	1	-0/+8
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Less s's	Erik Johnston	2017-11-14	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add new boolean columns to port script	Erik Johnston	2017-11-14	1	-0/+7
\| \|/ / / / / /
\| * \| \| \| / /	Bump version and changelog v0.25.0-rc1	Erik Johnston	2017-11-14	2	-1/+51
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #2658 from matrix-org/rav/store_heirarchy_init	Richard van der Hoff	2017-11-14	22	-44/+44
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Make __init__ consistent across Store hierarchy
\| \| * \| \| \|	Fix tests for Store.__init__ update	Richard van der Hoff	2017-11-13	5	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the test to pass the right number of args to the Store constructors
\| \| * \| \| \|	Make __init__ consitstent across Store heirarchy	Richard van der Hoff	2017-11-13	17	-33/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add db_conn parameters to the `__init__` methods of the *Store classes, so that they are all consistent, which makes the multiple inheritance work correctly (and so that we can later extract mixins which can be used in the slavedstores)
\| * \| \| \| \|	Merge pull request #2668 from turt2live/travis/whoami	Richard van der Hoff	2017-11-14	1	-0/+15
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a route for determining who you are
\| \| * \| \| \| \|	Remove redundent call	Travis Ralston	2017-11-13	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
\| \| * \| \| \| \|	Add a route for determining who you are	Travis Ralston	2017-11-12	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Useful for applications which may have an access token, but no idea as to who owns it. Signed-off-by: Travis Ralston <travpc@gmail.com>
\| * \| \| \| \| \|	Merge pull request #2669 from matrix-org/rav/cache_urlpreview_failure	Richard van der Hoff	2017-11-13	1	-41/+47
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache failures in url_preview handler
\| \| * \| \| \| \| \|	Bit more logging	Richard van der Hoff	2017-11-10	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Cache failures in url_preview handler	Richard van der Hoff	2017-11-10	1	-41/+45
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reshuffle the caching logic in the url_preview handler so that failures are cached (and to generally simplify things and fix the logcontext leaks).
\| * \| \| \| \| \|	Merge pull request #2663 from matrix-org/rav/invalid_request_utf8	Richard van der Hoff	2017-11-13	1	-1/+2
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|	Fix 500 on invalid utf-8 in request
\| \| * \| \| \| \|	Merge branch 'develop' into rav/invalid_request_utf8	Richard van der Hoff	2017-11-13	6	-18/+46
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Revert "move _state_group_cache to statestore"	Erik Johnston	2017-11-13	2	-12/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f5cf3638e9c6086e1c33ddad8eda9298cf53a58e.
\| * \| \| \| \| \|	Up cache size of get_global_account_data_by_type_for_user	Erik Johnston	2017-11-13	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #2662 from matrix-org/rav/fix_mxids_again	Richard van der Hoff	2017-11-10	3	-5/+32
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Downcase userid on registration
\| \| * \| \| \| \|	Add some more comments appservice user registration	Richard van der Hoff	2017-11-10	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain why we don't validate userids registered via app services
\| \| * \| \| \| \|	Downcase userids for shared-secret registration	Richard van der Hoff	2017-11-10	2	-3/+21
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Downcase userid on registration	Richard van der Hoff	2017-11-09	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Force username to lowercase before attempting to register https://github.com/matrix-org/synapse/issues/2660
\| \| * \| \| \| \|	Revert "Allow upper-case characters in mxids"	Richard van der Hoff	2017-11-09	1	-3/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit b70b64690330c25cbd04c1b2cacf8276b566efc8.
\| \| * / / /	Fix 500 on invalid utf-8 in request	Richard van der Hoff	2017-11-10	1	-1/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If somebody sends us a request where the the body is invalid utf-8, we should return a 400 rather than a 500. (json.loads throws a UnicodeError in this situation) We might as well catch all Exceptions here: it seems very unlikely that we would get a request that *isn't caused by invalid json.
\| * \| \| \|	Merge pull request #2659 from ↵	Richard van der Hoff	2017-11-09	1	-3/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/rav/apparently_we_dont_follow_our_own_spec_now Allow upper-case characters in mxids
\| \| * \| \| \|	Allow upper-case characters in mxids	Richard van der Hoff	2017-11-09	1	-3/+3
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because we're never going to be able to fix this :'(
\| * \| \| \|	Fix typo	Erik Johnston	2017-11-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Register group servlet	Erik Johnston	2017-11-09	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #2657 from matrix-org/erikj/group_visibility_namespace	Luke Barnard	2017-11-09	1	-9/+19
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Namespace visibility options for groups
\| \| * \| \| \|	Namespace visibility options for groups	Erik Johnston	2017-11-09	1	-9/+19
\| \|/ / / /
\| * \| \| \|	Merge pull request #2656 from matrix-org/rav/fix_deactivate	Richard van der Hoff	2017-11-09	1	-2/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'NoneType' not iterable in /deactivate
\| \| * \| \| \|	Fix 'NoneType' not iterable in /deactivate	Richard van der Hoff	2017-11-09	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make sure we actually return a value from user_delete_access_tokens
\| * \| \| \| \|	Merge pull request #2651 from matrix-org/erikj/update_group_room_settings	Erik Johnston	2017-11-09	6	-29/+120
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change so that update group room visibility isn't an upsert
\| \| * \| \| \| \|	Add brackets	Erik Johnston	2017-11-09	1	-2/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Have an explicit API to update room config	Erik Johnston	2017-11-08	6	-1/+100
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Revert "Modify group room association API to allow modification of is_public"	Erik Johnston	2017-11-08	6	-32/+22
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #2631 from xyzz/fix_appservice_event_backlog	Erik Johnston	2017-11-08	2	-8/+13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services
\| \| * \| \| \| \|	Remove useless assignment in notify_interested_services	Ilya Zhuravlev	2017-11-07	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix appservice tests to account for new behavior of notify_interested_services	Ilya Zhuravlev	2017-11-02	1	-3/+12
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix appservices being backlogged and not receiving new events due to a bug ↵	Ilya Zhuravlev	2017-11-02	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in notify_interested_services
\| * \| \| \| \| \|	Merge pull request #2637 from spantaleev/avoid-noop-media-deletes	Erik Johnston	2017-11-08	1	-0/+6
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|	Avoid no-op media deletes
\| \| * \| \| \| \|	Avoid no-op media deletes	Slavi Pantaleev	2017-11-04	1	-0/+6
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If there are no media entries to delete, avoid creating transactions, prepared statements and unnecessary log entries. Signed-off-by: Slavi Pantaleev <slavi@devture.com>
\| * \| \| \| \|	Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_res	Richard van der Hoff	2017-11-08	3	-33/+58
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug in state group storage
\| \| * \| \| \| \|	s/items/iteritems/	Richard van der Hoff	2017-11-08	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update deltas when doing auth resolution	Richard van der Hoff	2017-11-07	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a bug where the persisted state groups were different to those actually being used after auth resolution.
\| \| * \| \| \| \|	factor out _update_context_for_auth_events	Richard van der Hoff	2017-11-07	1	-20/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is duplicated, so let's factor it out before fixing it
\| \| * \| \| \| \|	move _state_group_cache to statestore	Richard van der Hoff	2017-11-07	2	-13/+12
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this is internal to statestore, so let's keep it there.
\| * \| \| \| \|	Merge pull request #2643 from matrix-org/matthew/user_dir_typos	Matthew Hodgson	2017-11-07	6	-14/+55
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Fix various embarrassing typos around user_directory and add some doc.
\| \| * \| \| \|	create new indexes before dropping old ones to keep safetynet in place	Matthew Hodgson	2017-11-07	1	-2/+4
\| \| \| \| \| \|
\| \| * \| \| \|	s/users_in_pubic_room/users_in_public_rooms/g	Matthew Hodgson	2017-11-04	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	s/users_in_pubic_room/users_in_public_rooms/g	Matthew Hodgson	2017-11-04	2	-10/+32
\| \| \| \| \| \|
\| \| * \| \| \|	fix copyright....	Matthew Hodgson	2017-11-04	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	s/popualte/populate/	Matthew Hodgson	2017-11-04	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	s/intial/initial/	Matthew Hodgson	2017-11-04	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	simplify instructions for regenerating user_dir	Matthew Hodgson	2017-11-04	1	-0/+17
\| \| \|/ / /
\| * \| \| \|	Merge pull request #2636 from farialima/me-master	Erik Johnston	2017-11-07	1	-13/+8
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix for #2635: correctly update rooms avatar/display name when modified by admin
\| \| * \| \| \|	removed unused import flagged by flake8a	Francois Granade	2017-11-03	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Fix for issue 2635: correctly update rooms avatar/display name when modified ↵	Francois Granade	2017-11-03	1	-12/+8
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	by admin
\| * \| \| \|	Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop"	Erik Johnston	2017-11-07	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f9b255cd62fe724e16b2222f6af623b2d39282ab, reversing changes made to 1bd654dabde776bbb7ee365c115b307cd6a110b8.
\| * \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-11-07	1	-10/+1
\| \|\ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #2598 from matrix-org/revert-2596-erikj/attestation_jitter	Erik Johnston	2017-10-27	1	-12/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Revert "Add jitter to validity period of attestations"
\| * \| \| \|	Revert "Add jitter to validity period of attestations"	Erik Johnston	2017-10-27	1	-12/+1
\|/ / / /
* \| \| \|	Merge pull request #2596 from matrix-org/erikj/attestation_jitter	Erik Johnston	2017-10-27	1	-1/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add jitter to validity period of attestations
\| \| * \ \	Merge pull request #2647 from matrix-org/luke/get-group-users-is-privileged	Luke Barnard	2017-11-07	2	-3/+4
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Return whether a user is an admin within a group
\| \| \| * \| \|	Remember to pick is_admin out of the db	Luke Barnard	2017-11-07	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Return whether a user is an admin within a group	Luke Barnard	2017-11-07	1	-2/+3
\| \| \|/ / /
\| \| * \| \|	Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-preview	Matthew Hodgson	2017-11-07	1	-1/+8
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Ignore <noscript> tags when generating URL preview descriptions
\| \| \| * \| \|	Ignore noscript tags when generating URL previews	Maxime Vaillancourt	2017-10-25	1	-1/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #2646 from matrix-org/rav/logging_for_limiter	Richard van der Hoff	2017-11-07	1	-7/+17
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|	Logging and logcontext fixes for Limiter
\| \| \| * \| \|	Logging and logcontext fixes for Limiter	Richard van der Hoff	2017-11-07	1	-7/+17
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some logging to the Limiter in a similar spirit to the Linearizer, to help debug issues. Also fix a logcontext leak. Also refactor slightly to avoid throwing exceptions.
\| \| * \| \|	Merge pull request #2630 from matrix-org/luke/fix-rooms-in-group	David Baker	2017-11-02	1	-3/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make the get_rooms_in_group API more sane
\| \| \| * \| \|	Make the get_rooms_in_group API more sane	Luke Barnard	2017-11-02	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return entries with is_public = True when they're public and is_public = False otherwise.
\| \| * \| \| \|	Merge pull request #2629 from matrix-org/rav/register_inhibit_login	David Baker	2017-11-02	1	-12/+16
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|	support inhibit_login in /register
\| \| \| * \| \|	support inhibit_login in /register	Richard van der Hoff	2017-11-02	1	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow things to pass inhibit_login when registering to ... inhibit logins.
\| \| * \| \| \|	Merge pull request #2628 from matrix-org/rav/module_api_hooks	David Baker	2017-11-02	1	-0/+34
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more hooks to ModuleApi
\| \| \| * \ \ \	Merge remote-tracking branch 'origin/develop' into rav/module_api_hooks	David Baker	2017-11-02	3	-45/+137
\| \| \| \|\ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge pull request #2627 from matrix-org/rav/custom_rest_endpoints	David Baker	2017-11-02	3	-0/+74
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a hook for custom rest endpoints
\| \| \| * \| \| \| \|	Add a hook for custom rest endpoints	Richard van der Hoff	2017-11-02	3	-0/+74
\| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let the user specify custom modules which can be used for implementing extra endpoints.
\| \| * \| \| \| \|	Merge pull request #2626 from matrix-org/rav/refactor_module_api	David Baker	2017-11-02	3	-70/+83
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Factor _AccountHandler proxy out to ModuleApi
\| \| * \ \ \ \ \	Merge pull request #2625 from matrix-org/rav/named_resource_refactor	David Baker	2017-11-02	1	-46/+64
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|	Factor out _configure_named_resource
\| \| \| * \| \| \| \|	Factor out _configure_named_resource	Richard van der Hoff	2017-11-02	1	-46/+64
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was a bit of a code vomit, so let's factor it out to preserve some sanity
\| \| \| \| * / /	Add more hooks to ModuleApi	Richard van der Hoff	2017-11-02	1	-0/+34
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add `get_user_by_req` and `invalidate_access_token`
\| \| \| * / /	Factor _AccountHandler proxy out to ModuleApi	Richard van der Hoff	2017-11-02	3	-70/+83
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're going to need to use this from places that aren't password auth, so let's move it to a proper class.
\| \| * \| \|	Merge pull request #2624 from matrix-org/rav/password_provider_notify_logout	David Baker	2017-11-02	3	-7/+42
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Notify auth providers on logout
\| \| \| * \| \|	Notify auth providers on logout	Richard van der Hoff	2017-11-01	3	-7/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide a hook by which auth providers can be notified of logouts.
\| \| * \| \| \|	Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providers	David Baker	2017-11-02	3	-7/+20
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow password_auth_providers to return a callback
\| \| \| * \| \| \|	Fix user-interactive password auth	Richard van der Hoff	2017-11-01	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this got broken in the previous commit
\| \| \| * \| \| \|	Allow password_auth_providers to return a callback	Richard van der Hoff	2017-11-01	3	-6/+17
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... so that they have a way to record access tokens.
\| \| * \| \| \|	Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providers	David Baker	2017-11-02	1	-0/+16
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|	Let auth providers get to the database
\| \| \| * \| \|	Let auth providers get to the database	Richard van der Hoff	2017-10-31	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Somewhat open to abuse, but also somewhat unavoidable :/
\| \| * \| \| \|	Merge pull request #2620 from matrix-org/rav/auth_non_password	Richard van der Hoff	2017-11-01	2	-32/+139
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let password auth providers handle arbitrary login types
\| \| \| * \| \| \|	Let password auth providers handle arbitrary login types	Richard van der Hoff	2017-11-01	2	-32/+139
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide a hook where password auth providers can say they know about other login types, and get passed the relevant parameters
\| \| * \| \| \|	Merge pull request #2621 from matrix-org/rav/refactor_accesstoken_delete	David Baker	2017-11-01	6	-27/+62
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move access token deletion into auth handler
\| \| \| * \ \ \	Merge remote-tracking branch 'origin/develop' into ↵	David Baker	2017-11-01	15	-98/+65
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rav/refactor_accesstoken_delete
\| \| \| * \| \| \| \|	Move access token deletion into auth handler	Richard van der Hoff	2017-11-01	6	-27/+62
\| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also move duplicated deactivation code into the auth handler. I want to add some hooks when we deactivate an access token, so let's bring it all in here so that there's somewhere to put it.
\| \| * \| \| \| \|	Merge pull request #2617 from matrix-org/matthew/auto-displayname	Matthew Hodgson	2017-11-01	1	-2/+4
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|	automatically set default displayname on register
\| \| \| * \| \| \|	switch to setting default displayname in the storage layer	Matthew Hodgson	2017-11-01	2	-10/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to avoid clobbering guest user displaynames on registration
\| \| \| * \| \| \|	automatically set default displayname on register	Matthew Hodgson	2017-11-01	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to avoid leaking ugly MXIDs and cluttering up the timeline with displayname changes as well as membership joins for autojoin rooms (e.g. the status autojoin rooms), automatically set the displayname to match the localpart of the mxid upon registration.
\| \| * \| \| \| \|	Merge pull request #2615 from matrix-org/rav/break_auth_device_dep	David Baker	2017-11-01	3	-13/+6
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Break dependency of auth_handler on device_handler
\| \| \| * \| \| \| \|	Break dependency of auth_handler on device_handler	Richard van der Hoff	2017-11-01	3	-13/+6
\| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm going to need to make the device_handler depend on the auth_handler, so I need to break this dependency to avoid a cycle. It turns out that the auth_handler was only using the device_handler in one place which was an edge case which we can more elegantly handle by throwing an error rather than fixing it up.
\| \| * \| \| \| \|	Merge pull request #2613 from matrix-org/rav/kill_refresh_tokens	David Baker	2017-11-01	6	-63/+17
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the last vestiges of refresh_tokens
\| \| \| * \| \| \| \|	Fix tests for refresh_token removal	Richard van der Hoff	2017-11-01	1	-3/+3
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Remove the last vestiges of refresh_tokens	Richard van der Hoff	2017-10-31	5	-60/+14
\| \| \| \|/ / / /
\| \| * \| \| \| \|	Merge pull request #2618 from matrix-org/dbkr/log_login_requests	David Baker	2017-11-01	1	-0/+10
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|	Log login requests