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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unecessary setting of outlier bit	Erik Johnston	2019-01-24	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Use term 'out of band membership' instead	Erik Johnston	2019-01-24	3	-9/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4437 from matrix-org/erikj/event_format_version_v2	Erik Johnston	2019-01-24	6	-4/+49
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Add support for persisting event format versions
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix	Andrew Morgan	2019-01-24	2	-2/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a 60s timeout to filtered room directory queries
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Change default timeout value from 0 to None	Andrew Morgan	2019-01-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use self.clock instead of datetime	Andrew Morgan	2019-01-24	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	isort	Andrew Morgan	2019-01-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog	Andrew Morgan	2019-01-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	lint	Andrew Morgan	2019-01-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Time out filtered room dir queries after 60s	Andrew Morgan	2019-01-24	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4464 from matrix-org/rav/fix_srv_lookup	Richard van der Hoff	2019-01-24	3	-12/+89
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MatrixFederationAgent: Look up the right SRV record
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Look up the right SRV record	Richard van der Hoff	2019-01-24	3	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	lots more tests for MatrixFederationAgent	Richard van der Hoff	2019-01-24	1	-10/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate the debian config during build (#4444)	Richard van der Hoff	2019-01-24	4	-617/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than hardcoding a config which we always forget to update, generate it from the default config.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UnboundLocalError in post_urlencoded_get_json (#4460)	Richard van der Hoff	2019-01-24	2	-2/+4
\|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This could cause exceptions if the id server returned 4xx responses.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check	Neil Johnson	2019-01-24	5	-9/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Neilj/fix threepid auth check
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	move guard out of is_threepid_reserved and into register.py	Neil Johnson	2019-01-22	3	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix None guard in config.server.is_threepid_reserved	Neil Johnson	2019-01-22	5	-8/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4458 from matrix-org/dbkr/public_baseurl_doc	Neil Johnson	2019-01-24	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify docs for public_baseurl
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changelog	David Baker	2019-01-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify docs for public_baseurl	David Baker	2019-01-24	1	-1/+5
\| \| \|/ / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is leading to problems with people upgrading to clients that support MSC1730 because people have this misconfigured, so try to make the docs completely unambiguous.
* / \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UPSERT check (#4459)	Amber Brown	2019-01-24	2	-5/+29
\|/ / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Use native UPSERTs where possible (#4306)	Amber Brown	2019-01-24	14	-43/+238
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't send IP addresses as SNI (#4452)	Richard van der Hoff	2019-01-24	3	-6/+73
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem here is that we have cut-and-pasted an impl from Twisted, and then failed to maintain it. It was fixed in Twisted in https://github.com/twisted/twisted/pull/1047/files; let's do the same here.
\| \| \| \| \| * \| \| \| \| \| \| \|	Replace missed usages of FrozenEvent	Erik Johnston	2019-01-24	3	-10/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \| \| \|	Fix tests	Erik Johnston	2019-01-24	5	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \| \| \|	Require event format version to parse or create events	Erik Johnston	2019-01-23	8	-74/+193
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \| \| \|	Merge branch 'erikj/fixup_rejecting_invites' of ↵	Erik Johnston	2019-01-23	5	-37/+32
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:matrix-org/synapse into erikj/require_format_version
\| \| \| * \| \| \| \| \| \| \| \| \|	Clarify the invite flows	Erik Johnston	2019-01-23	3	-7/+24
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Remove unnecessary '_sign_event'	Erik Johnston	2019-01-23	2	-15/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Store rejected remote invite events as outliers	Erik Johnston	2019-01-23	3	-38/+21
\| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently they're stored as non-outliers even though the server isn't in the room, which can be problematic in places where the code assumes it has the state for all non outlier events. In particular, there is an edge case where persisting the leave event triggers a state resolution, which requires looking up the room version from state. Since the server doesn't have the state, this causes an exception to be thrown.
\| \| \| \| * \| \| \| \| \| \| \|	Merge branch 'erikj/get_pdu_versions' into erikj/require_format_version	Erik Johnston	2019-01-23	29	-309/+937
\| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Add room_version param to get_pdu	Erik Johnston	2019-01-23	4	-13/+60
\| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we add new event format we'll need to know the event format or room version when parsing events.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backport	Andrew Morgan	2019-01-23	2	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add metric for user dir current event stream position
\| * \| \| \| \| \| \| \| \| \| \|	Add changelog	Andrew Morgan	2019-01-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add metric for user dir current event stream position	Andrew Morgan	2019-01-23	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4428 from matrix-org/rav/matrix_federation_agent	Richard van der Hoff	2019-01-23	9	-258/+555
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Move SRV magic into an Agent-like thing
\| * \| \| \| \| \| \| \| \| \| \|	fix python2 test failure	Richard van der Hoff	2019-01-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add a test for MatrixFederationAgent	Richard van der Hoff	2019-01-22	2	-1/+195
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	put resolve_service in an object	Richard van der Hoff	2019-01-22	3	-83/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this makes it easier to stub things out for tests.
\| * \| \| \| \| \| \| \| \| \| \|	Require that service_name be a byte string	Richard van der Hoff	2019-01-22	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it is only ever a bytes now, so let's enforce that.
\| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-01-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Kill off matrix_federation_endpoint	Richard van der Hoff	2019-01-22	2	-145/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this thing is now redundant.
\| * \| \| \| \| \| \| \| \| \| \|	Make MatrixFederationClient use MatrixFederationAgent	Richard van der Hoff	2019-01-22	2	-27/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... instead of the matrix_federation_endpoint
\| * \| \| \| \| \| \| \| \| \| \|	MatrixFederationAgent	Richard van der Hoff	2019-01-22	2	-0/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull the magic that is currently in matrix_federation_endpoint and friends into an agent-like thing
* \| \| \| \| \| \| \| \| \| \| \|	debian package: symlink to python-3.X (#4433)	Richard van der Hoff	2019-01-23	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the debian package, make the virtualenv symlink python to /usr/bin/python3.X rather than /usr/bin/python3. Also make sure we depend on the right python3.x package. This might help a bit with subtle failures when people install a package from the wrong distro (https://github.com/matrix-org/synapse/issues/4431).
* \| \| \| \| \| \| \| \| \| \| \|	Fixup removal of duplicate `user_ips` rows (#4432)	Erik Johnston	2019-01-23	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove unnecessary ORDER BY clause * Add logging * Newsfile
* \| \| \| \| \| \| \| \| \| \| \|	Support ACME for certificate provisioning (#4384)	Amber Brown	2019-01-23	8	-36/+298
\| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Merge branch 'erikj/msc_1813' into erikj/require_format_version	Erik Johnston	2019-01-23	5	-8/+41
\| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|/ / / / / /
\| \| \| \| * \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Implement MSC 1813 - Add room version to make APIs	Erik Johnston	2019-01-23	4	-8/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We also implement `make_membership_event` converting the returned room version to an event format version.
\| \| \| * \| \| \| \| \| \|	Update newsfile	Erik Johnston	2019-01-23	1	-1/+1
\| \| \| \|/ / / / / /
\| \| \| * \| \| \| \| \|	isort	Erik Johnston	2019-01-23	2	-4/+2
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-23	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Add support for persisting event format versions	Erik Johnston	2019-01-23	5	-4/+50
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we only have the one event format version defined, but this adds the necessary infrastructure to persist and fetch the format versions alongside the events. We specify the format version rather than the room version as: 1. We don't necessarily know the room version, existing events may be either v1 or v2. 2. We'd need to be careful to prevent/handle correctly if different events in the same room reported to be of different versions, which sounds annoying.
* \| \| \| \| \| \| \|	Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedup	Erik Johnston	2019-01-22	2	-26/+36
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Fix bug when removing duplicate rows from user_ips
\| * \| \| \| \| \| \|	Refactor to rewrite the SQL instead	Erik Johnston	2019-01-22	1	-13/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't shadow params	Erik Johnston	2019-01-22	1	-4/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-22	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix bug when removing duplicate rows from user_ips	Erik Johnston	2019-01-22	1	-13/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was caused by accidentally overwritting a `last_seen` variable in a for loop, causing the wrong value to be written to the progress table. The result of which was that we didn't scan sections of the table when searching for duplicates, and so some duplicates did not get deleted.
* \| \| \| \| \| \| \|	Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration	Neil Johnson	2019-01-22	3	-11/+15
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Config option to disable requesting MSISDN on registration
\| * \| \| \| \| \| \|	fix line length	Neil Johnson	2019-01-21	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Config option to disable requesting MSISDN on registration	Neil Johnson	2019-01-21	3	-11/+13
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Move tag and direct state copying into separate function	Andrew Morgan	2019-01-25	1	-43/+63
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	lint	Andrew Morgan	2019-01-22	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Andrew Morgan	2019-01-22	3	-172/+8
\| \| \| \| \|\ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	anoa/dm_room_upgrade
* \| \| \| \| \| \| \|	Make key fetches use regular federation client (#4426)	Richard van der Hoff	2019-01-22	3	-172/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All this magic is redundant.
\| \| \| \| * \| \| \|	Prevent duplicate room IDs in m.direct	Andrew Morgan	2019-01-22	1	-10/+9
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Fix comments	Andrew Morgan	2019-01-22	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Join logic covers both room creator and arbitrary users	Andrew Morgan	2019-01-22	1	-33/+0
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	tags, m.direct copying over correctly	Andrew Morgan	2019-01-22	2	-11/+62
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Fix typos	Andrew Morgan	2019-01-22	4	-14/+14
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Migrating dm and room tags work for migrator	Andrew Morgan	2019-01-22	1	-2/+13
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Prevent crash on user who doesn't have any direct rooms	Andrew Morgan	2019-01-22	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Add changelog	Andrew Morgan	2019-01-22	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Preserve DM status of a room on upgrade	Andrew Morgan	2019-01-22	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Andrew Morgan <andrew@amorgan.xyz>
\| \| \| \| * \| \| \|	Fix typo	Andrew Morgan	2019-01-22	1	-2/+2
\| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Refactor and bugfix for resove_service (#4427)	Richard van der Hoff	2019-01-22	6	-86/+250
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Require ECDH key exchange & remove dh_params (#4429)	Amber Brown	2019-01-22	8	-57/+6
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	* remove dh_params and set better cipher string
* \| \| \| \| \|	Merge pull request #4402 from matrix-org/erikj/fed_v2_invite_server	Erik Johnston	2019-01-21	4	-6/+42
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Implement server side of MSC1794 - Federation v2 Invite API
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-01-21	24	-118/+261
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	erikj/fed_v2_invite_server
* \| \| \| \| \|	Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis	Erik Johnston	2019-01-21	4	-68/+74
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add groundwork for new versions of federation APIs
* \| \| \| \| \| \|	Migrate encryption state on room upgrade (#4411)	Andrew Morgan	2019-01-21	3	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Migrate encryption state on room upgrade Signed-off-by: Andrew Morgan <andrew@amorgan.xyz> * Add changelog file
* \| \| \| \| \| \|	Fix race when persisting create event (#4404)	Erik Johnston	2019-01-18	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix race when persisting create event When persisting a chunk of DAG it is sometimes requried to do a state resolution, which requires knowledge of the room version. If this happens while we're persisting the create event then we need to use that event rather than attempting to look it up in the database.
* \| \| \| \| \| \|	Tweak code coverage settings (#4400)	Erik Johnston	2019-01-18	3	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Tweak code coverage settings * Fix manifest * Newsfile * Fix commit status?
* \| \| \| \| \| \|	Remove redundant WrappedConnection (#4409)	Richard van der Hoff	2019-01-18	4	-93/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove redundant WrappedConnection The matrix federation client uses an HTTP connection pool, which times out its idle HTTP connections, so there is no need for any of this business.
* \| \| \| \| \| \|	Fix incorrect logcontexts after a Deferred was cancelled (#4407)	Richard van der Hoff	2019-01-17	4	-3/+117
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	sign_request -> build_auth_headers (#4408)	Richard van der Hoff	2019-01-17	3	-15/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just got very confused about the fact that the headers are only an output, not an input.
* \| \| \| \| \|	Changing macaroon_secret_key no longer logs you out (#4387)	Richard van der Hoff	2019-01-16	2	-3/+1
\| \| \| \| \| \|
* \| \| \| \| \|	don't store more remote device lists if they have more than 1K devices (#4397)	Richard van der Hoff	2019-01-16	2	-0/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4399 from andrewshadura/update-python-deps	Erik Johnston	2019-01-16	2	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Dependencies
\| * \| \| \| \| \|	Add a changelog entry	Andrej Shadura	2019-01-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
\| * \| \| \| \| \|	Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynacl	Andrej Shadura	2019-01-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since 0.13.0, pymacaroons works correctly with pynacl, so there isn’t any more reason to depend on an outdated pynacl fork. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
\| * \| \| \| \| \|	Use msgpack instead of msgpack-python	Andrej Shadura	2019-01-16	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The package msgpack-python has been deprecated. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
* \| \| \| \| \|	Merge pull request #4392 from matrix-org/neilj/fix_user_type_typo	Erik Johnston	2019-01-15	2	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ALL_USER_TYPES should be a tuple
\| * \| \| \| \| \|	ALL_USER_TYPES should be a tuple	Neil Johnson	2019-01-15	2	-1/+2
\|/ / / / / /
\| \| * \| \| \|	Newsfile	Erik Johnston	2019-01-16	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add /v2/invite federation API	Erik Johnston	2019-01-15	3	-6/+41
\| \|/ / / /
\| * \| \| \|	Newsfile	Erik Johnston	2019-01-15	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add groundwork for new versions of federation APIs	Erik Johnston	2019-01-15	3	-68/+73
\|/ / / /
* \| \| \|	Merge branch 'release-v0.34.1.1' into develop	Richard van der Hoff	2019-01-12	4	-49/+163
\|\ \ \ \
\| * \| \| \|	moar plusses!	Richard van der Hoff	2019-01-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	turns out that 0.34.1.1+1 comes before 0.34.1.1+bionic (etc). The version may only contain "~ 0-9 A-Z a-z + - ." (sorting in that order). Option 1: replace "+" with something that sorts after +. Options are "-" (but dpkg-source complains about that) or "." (but that would mean we couldn't distinguish packaging-only changes from real changes). Option 2: stick with + and just find something that sorts after 'xenial'. The only options there are "-", "." (same problems as before), "z", and "+". Hence, ++1. Sorry.
\| * \| \| \|	Rewrite build_debian_packages github/release-v0.34.1.1 release-v0.34.1.1	Richard van der Hoff	2019-01-12	2	-46/+154
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite this in python so that it can be run in parallel.
\| * \| \| \|	s/Breaks/Conflicts/ in debian/control	Richard van der Hoff	2019-01-11	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise people can't upgrade from matrix-synapse without removing it first
* \| \| \| \|	Silence travis-ci build warnings by removing non-functional python3.6 (#4377)	Richard van der Hoff	2019-01-12	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove non-functional python3.6 in travis env * changelog
* \| \| \| \|	Remove duplicates in the user_ips table and add an index (#4370)	Amber Brown	2019-01-12	4	-4/+164
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Amber Brown	2019-01-11	6	-195/+51
\|\ \ \ \ \
\| * \| \| \| \|	Merge Synapse v0.34.1.1	Amber Brown	2019-01-11	6	-195/+51
\| \|\\| \| \| \|
\| \| * \| \| \|	changelog, for debian	Amber Brown	2019-01-11	1	-0/+6
\| \| \| \| \| \|
\| \| * \| \| \|	changelog v0.34.1.1	Amber Brown	2019-01-11	2	-1/+14
\| \| \| \| \| \|
\| \| * \| \| \|	version	Amber Brown	2019-01-11	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1	Amber Brown	2019-01-11	4	-194/+31
\| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spontaneous logout
\| \| * \| \| \|	changelog	Richard van der Hoff	2019-01-10	2	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1	Richard van der Hoff	2019-01-10	4	-194/+31
\| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4371
\| \| * \| \| \|	Revert "Fix macaroon_secret_key fallback logic"	Richard van der Hoff	2019-01-10	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is already fixed in 0.34.1, by 59f93bb This reverts commit efc522c55e996e420271de2d9094835dda52ade4.
\| \| * \| \| \|	changelog	Richard van der Hoff	2019-01-10	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34	Richard van der Hoff	2019-01-10	3	-197/+33
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Fix macaroon_secret_key fallback logic	Richard van der Hoff	2019-01-10	1	-3/+3
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Skip macaroon check for access tokens in the db	Richard van der Hoff	2019-01-10	2	-186/+28
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Fix fallback to signing key for macaroon-secret-key	Richard van der Hoff	2019-01-10	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #4342 from aaronraimist/new-virtualenv	Richard van der Hoff	2019-01-10	2	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README to use new virtualenv (#4328)
\| * \| \| \| \| \| \|	README.rst: fix hash_password path	Richard van der Hoff	2019-01-02	1	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add changelog	Aaron Raimist	2019-01-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
\| * \| \| \| \| \| \|	Update README to use new virtualenv (#4328)	Aaron Raimist	2019-01-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
* \| \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2019-01-09	1	-3/+1
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix docker build to install optional deps github/release-v0.34.1 release-v0.34.1	Richard van der Hoff	2019-01-09	1	-3/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2019-01-09	2	-1/+8
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	debian: Remove Breaks: matrix-synapse-ldap3 v0.34.1+1	Richard van der Hoff	2019-01-09	2	-1/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2019-01-09	45	-46/+73
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	0.34.1 v0.34.1	Richard van der Hoff	2019-01-09	5	-5/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' into release-v0.34.1	Erik Johnston	2019-01-09	4	-6/+13
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	clean up changelog v0.34.1rc1	Richard van der Hoff	2019-01-08	1	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	0.34.1rc1	Richard van der Hoff	2019-01-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2019-01-08	41	-41/+61
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4368 from matrix-org/erikj/better_errors	Erik Johnston	2019-01-09	2	-68/+74
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixup docstrings for matrixfederationclient
\| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixup docstrings for matrixfederationclient	Erik Johnston	2019-01-09	1	-68/+73
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix adding new rows instead of updating them if one of the key values is a ↵	Amber Brown	2019-01-09	3	-1/+81
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NULL in upserts. (#4369)
* \| \| \| \| \| \| \| \|	Merge pull request #4362 from matrix-org/erikj/better_errors	Erik Johnston	2019-01-09	2	-5/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use RequestSendFailed when fail to parse content type headers
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-08	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use RequestSendFailed when fail to parse content type headers	Erik Johnston	2019-01-08	1	-5/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4361 from matrix-org/erikj/better_errors	Erik Johnston	2019-01-08	2	-1/+7
\|\\| \| \| \| \| \| \| \| \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Don't log stack traces for HTTP error responses
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-01-08	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't log stack traces for HTTP error responses	Erik Johnston	2019-01-08	1	-1/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Refactor request sending to have better excpetions (#4358)	Erik Johnston	2019-01-08	6	-44/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Correctly retry and back off if we get a HTTPerror response * Refactor request sending to have better excpetions MatrixFederationHttpClient blindly reraised exceptions to the caller without differentiating "expected" failures (e.g. connection timeouts etc) versus more severe problems (e.g. programming errors). This commit adds a RequestSendFailed exception that is raised when "expected" failures happen, allowing the TransactionQueue to log them as warnings while allowing us to log other exceptions as actual exceptions.
* \| \| \| \| \| \|	Fix synapse.config.__main__ on python 3 (#4356)	Amber Brown	2019-01-08	2	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix command hint to generate a config file (#4353)	Jason Robinson	2019-01-07	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix command hint to generate a config file When trying to start Synapse without a config file, it will complain and give a hint towards what command to run. This hinted command is missing the "report_stats" parameter, which is required with either yes or no value. Add this to the command. Not an ideal situation but makes the given command work without the user getting another error, even though it might be unclear what "report_stats" represents. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* \| \| \| \| \| \|	Add GET account data routes (#4303)	Travis Ralston	2019-01-07	2	-1/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As per https://github.com/matrix-org/matrix-doc/issues/1339
* \| \| \| \| \| \|	Check jinja version for consent resource (#4327)	Richard van der Hoff	2019-01-07	4	-28/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Raise a ConfigError if an invalid resource is specified * Require Jinja 2.9 for the consent resource * changelog
* \| \| \| \| \| \|	fix the check for whether `is_url` to match all the other ones in codebase ↵	Michael Telatynski	2019-01-06	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(#3405) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* \| \| \| \| \| \|	Update debian Conflicts specifications (#4349)	Richard van der Hoff	2019-01-04	3	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... to allow installation alongside our matrix-synapse transitional package.
* \| \| \| \| \| \|	fix NPE in /messages by checking if all events were filtered out (#4330)	Matthew Hodgson	2019-01-02	2	-10/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update README to not lie about required restart (#4343)	Aaron Raimist	2019-01-02	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Update README to not lie about required restart Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* \| \| \| \| \| \|	Merge pull request #4344 from matrix-org/neilj/fix_synchrotron_fix_4312	Neil Johnson	2019-01-02	2	-25/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure synchrotrons can access is_support_user in the storage layer
\| * \| \| \| \| \| \|	Ensure synchrotrons can access is_support_user in the storage layer	Neil Johnson	2019-01-02	2	-25/+26
\|/ / / / / / /
* \| \| \| \| \| \|	Update docker-compose.yml (#4282)	jribal	2019-01-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hi, the original docker-compose file did not work by default. You get federation port working but no client port. My proposal is to let federation port work as it is by default (8448) and let traefik handle client http/https traffic.
* \| \| \| \| \| \|	Update PR template to use absolute links (#4341)	Aaron Raimist	2019-01-02	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Update PR template to use absolute links Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* \| \| \| \| \| \|	Avoid packaging _trial_temp directory (#4326)	Richard van der Hoff	2019-01-02	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure we don't put the _trial_temp directory in the package target directory. Fixes https://github.com/matrix-org/synapse/issues/4322
* \| \| \| \| \| \|	Install the optional dependencies into the debian package (#4325)	Richard van der Hoff	2019-01-02	5	-20/+37
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	since #4298, the optional dependencies are no longer installed with a simple `pip install .`, which meant that they were not being included in the debian package. The easy fix to that is dh_virtualenv --extras, but that needs dh_virtualenv 1.1...
* \| \| \| \| \|	Remove v1 only REST APIs now we don't ship matrix console (#4334)	Amber Brown	2018-12-29	7	-590/+45
\| \| \| \| \| \|
* \| \| \| \| \|	Remove mention of lt-cred-mech in the sample coturn config. (#4333)	Krithin Sitaram	2018-12-28	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Remove mention of lt-cred-mech in the sample coturn config. See https://github.com/coturn/coturn/pull/262 for more context. Also clean up some minor formatting issues while I'm here. * Add changelog. Signed-off-by: Krithin Sitaram <krithin@gmail.com>
* \| \| \| \| \|	Log roomid along with Unknown room (#4297)	Will Hunt	2018-12-24	2	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4307 from matrix-org/erikj/v2_rooms	Richard van der Hoff	2018-12-24	3	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add v2 room version
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-12-18	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add v2 room version	Erik Johnston	2018-12-18	2	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Return well_known in /login response (#4319)	Richard van der Hoff	2018-12-24	3	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... as per MSC1730.
* \| \| \| \| \| \|	Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5	Richard van der Hoff	2018-12-23	2	-1/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix test_metrics.py compatibility prometheus_client 0.5
\| * \| \| \| \| \| \|	Fix test_metrics.py compatibility prometheus_client 0.5	Maarten de Vries	2018-12-21	2	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prometheus_client 0.5 has a named-tuple Sample type with more member than the old plain tuple had. This commit makes sure the unit test detects this and changes the way it reads the sample. Signed-off-by: Maarten de Vries <maarten@de-vri.es>
* \| \| \| \| \| \| \|	Merge pull request #4316 from matrix-org/rav/fix_docker_upload	Richard van der Hoff	2018-12-21	2	-2/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix circleci config for synapse:latest docker upload
\| * \| \| \| \| \| \| \|	Fix circleci config for synapse:latest docker upload	Richard van der Hoff	2018-12-21	2	-2/+3
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Give the image the right tag, so that we can push it.
* \| \| \| \| \| \| \|	Add a script to generate a clean config file (#4315)	Richard van der Hoff	2018-12-22	11	-46/+157
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix indentation in default config (#4313)	Richard van der Hoff	2018-12-22	2	-35/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These settings are not supposed to be under 'listeners'.
* \| \| \| \| \| \| \|	Fix IP URL previews on Python 3 (#4215)	Amber Brown	2018-12-22	8	-272/+590
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Make the dependencies more like a standard Python project and hook up the ↵	Amber Brown	2018-12-22	7	-158/+111
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	optional dependencies to setuptools (#4298)
* \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2018-12-20	1	-2/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Mention updating extensions github/release-v0.34.0 release-v0.34.0	Richard van der Hoff	2018-12-20	1	-2/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2018-12-20	1	-3/+4
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	clarify that installing -py3 removes the old pkg	Richard van der Hoff	2018-12-20	1	-3/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2018-12-20	1	-1/+8
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	buster is a thing	Richard van der Hoff	2018-12-20	1	-1/+8
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2018-12-20	42	-29/+2514
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Clarify that py2 packages will continue to exist v0.34.0	Richard van der Hoff	2018-12-20	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	document supported python 3 versions	Richard van der Hoff	2018-12-20	2	-5/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	more changelog fix	Richard van der Hoff	2018-12-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	minor changelog tweaks	Richard van der Hoff	2018-12-20	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix UPGRADE formatting	Richard van der Hoff	2018-12-20	1	-6/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Prepare 0.34 release	Richard van der Hoff	2018-12-20	7	-24/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update log config for debian packages	Richard van der Hoff	2018-12-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better follow our own release notes.
\| * \| \| \| \| \|	Debian packaging via dh_virtualenv	Richard van der Hoff	2018-12-20	41	-2/+2481
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Debian packaging via dh_virtualenv (#4285)	Richard van der Hoff	2018-12-20	36	-509/+310
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	import from package-debian-synapse	Amber Brown	2018-12-20	38	-0/+2678
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add 'sandbox' to CSP for media repo (#4284)	David Baker	2018-12-20	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add 'sandbox' to the CSP for media repo * Changelog
\| * \| \| \| \| \| \|	Improved welcome page (#4294)	Nad Chishtie	2018-12-14	2	-25/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.
\| * \| \| \| \| \| \|	Settings Fix deleting e2e room keys on xenial (#4295)	Amber Brown	2018-12-14	2	-1/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #4309 from KB1RD/KB1RD-fixes	Richard van der Hoff	2018-12-19	2	-3/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the variable names used for account_data
\| * \| \| \| \| \| \|	Create 4309.bugfix	Nathan Pennie	2018-12-19	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed line length	Nathan Pennie	2018-12-19	1	-1/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix the variable names used for account_data	Nathan Pennie	2018-12-19	1	-3/+3
\|/ / / / / / /
* \| \| \| \| \| \|	ensure can report mau stats when hs.config.mau_stats_only is set (#4305)	Neil Johnson	2018-12-18	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* ensure can report mau stats when hs.config.mau_stats_only is set
* \| \| \| \| \| \|	create support user (#4141)	Neil Johnson	2018-12-14	20	-47/+371
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits.
* \| \| \| \| \| \|	Settings Fix deleting e2e room keys on xenial (#4295)	Amber Brown	2018-12-14	2	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Improved welcome page (#4294)	Nad Chishtie	2018-12-14	2	-25/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.
* \| \| \| \| \| \|	Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_link	Richard van der Hoff	2018-12-11	2	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update link to kernel.org DCO usage
\| * \| \| \| \| \| \|	Update CONTRIBUTING.rst	Michael Kaye	2018-12-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce size of hyperlink
\| * \| \| \| \| \| \|	changelog	Michael Kaye	2018-12-07	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update link to kernel.org DCO usage	Michael Kaye	2018-12-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://www.kernel.org/doc/Documentation/SubmittingPatches returns a simple page indicating that it's moved to: "process/submitting-patches.rst". I believe the new link contains the same information as what was previously linked to.
* \| \| \| \| \| \| \|	Merge branch 'release-v0.34.0' into develop	Richard van der Hoff	2018-12-11	43	-98/+146
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	0.34.0rc2 v0.34.0rc2	Richard van der Hoff	2018-12-11	5	-4/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	remove changelog files	Richard van der Hoff	2018-12-11	34	-36/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #4290 from matrix-org/rav/remove_webclient	Richard van der Hoff	2018-12-11	6	-58/+44
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop installing Matrix Console by default
\| \| * \| \| \| \| \| \|	Stop installing Matrix Console by default	Richard van der Hoff	2018-12-11	6	-58/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is based on the work done by @krombel in #2601.
\| * \| \| \| \| \| \| \|	Merge pull request #4289 from matrix-org/rav/welcome_page	Richard van der Hoff	2018-12-11	3	-0/+30
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a welcome page to the static resources
\| \| * \ \ \ \ \ \ \	Merge branch 'rav/disable_pager_in_ci' into rav/welcome_page	Richard van der Hoff	2018-12-11	2	-2/+3
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Add a welcome page to the static resources	Richard van der Hoff	2018-12-11	3	-0/+30
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601.
\| * \| \| \| \| \| \| \| \|	Merge pull request #4291 from matrix-org/rav/disable_pager_in_ci	Richard van der Hoff	2018-12-11	2	-2/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|	Disable pager for ci script
\| \| * \| \| \| \| \| \| \|	Disable pager for ci script	Richard van der Hoff	2018-12-11	2	-2/+3
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... otherwise it hangs
\| * \| \| \| \| \| \| \|	fix upgrade.rst link again v0.34.0rc1	Richard van der Hoff	2018-12-04	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix link to upgrade notes	Richard van der Hoff	2018-12-04	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix typo in changelog	Richard van der Hoff	2018-12-04	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prepare 0.34.0rc1	Richard van der Hoff	2018-12-04	2	-2/+56
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Add 'sandbox' to CSP for media repo (#4284)	David Baker	2018-12-11	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add 'sandbox' to the CSP for media repo * Changelog
* \| \| \| \| \| \| \|	Merge pull request #4279 from matrix-org/hs/fix-config-cors	Will Hunt	2018-12-10	2	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make /config more CORS-y
\| * \| \| \| \| \| \| \|	Move imports to one line	Will Hunt	2018-12-10	1	-4/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use `send_cors`	Will Hunt	2018-12-10	1	-4/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	changelog & isort	Will Hunt	2018-12-09	2	-1/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make /config more CORS-y	Will Hunt	2018-12-09	1	-1/+3
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4283 from matrix-org/erikj/isort_df	Erik Johnston	2018-12-10	2	-2/+3
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Make isort tox check print diff when it fails
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-12-10	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make isort tox check print diff when it fails	Erik Johnston	2018-12-10	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Initialise user displayname from SAML2 data (#4272)	Richard van der Hoff	2018-12-07	6	-15/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we register a new user from SAML2 data, initialise their displayname correctly.
* \| \| \| \| \| \|	Update the example systemd config to use a virtualenv (#4273)	Richard van der Hoff	2018-12-07	3	-22/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you're installing as a system package, the system package should have set up the systemd config, so it's more useful to give an example of running in a virtualenv here.
* \| \| \| \| \| \|	Implement SAML2 authentication (#4267)	Richard van der Hoff	2018-12-07	9	-2/+258
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This implements both a SAML2 metadata endpoint (at `/_matrix/saml2/metadata.xml`), and a SAML2 response receiver (at `/_matrix/saml2/authn_response`). If the SAML2 response matches what's been configured, we complete the SSO login flow by redirecting to the client url (aka `RelayState` in SAML2 jargon) with a login token. What we don't yet have is anything to build a SAML2 request and redirect the user to the identity provider. That is left as an exercise for the reader.
* \| \| \| \| \| \|	Factor SSO success handling out of CAS login (#4264)	Richard van der Hoff	2018-12-07	5	-32/+184
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is mostly factoring out the post-CAS-login code to somewhere we can reuse it for other SSO flows, but it also fixes the userid mapping while we're at it.
* \| \| \| \| \| \|	Rip out half-implemented m.login.saml2 support (#4265)	Richard van der Hoff	2018-12-06	7	-169/+4
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Rip out half-implemented m.login.saml2 support This was implemented in an odd way that left most of the work to the client, in a way that I really didn't understand. It's going to be a pain to maintain, so let's start by ripping it out. * drop undocumented dependency on dateutil It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat.
* \| \| \| \| \|	drop undocumented dependency on dateutil (#4266)	Richard van der Hoff	2018-12-06	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat.
* \| \| \| \| \|	Implement .well-known handling (#4262)	Richard van der Hoff	2018-12-05	5	-0/+140
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes it's useful for synapse to generate its own .well-known file.
* \| \| \| \|	Merge pull request #4260 from matrix-org/rav/python3	Richard van der Hoff	2018-12-04	3	-53/+82
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Notes on upgrading to python3, and README updates.
\| * \| \| \| \|	Notes on upgrading to python3, and README updates.	Richard van der Hoff	2018-12-04	3	-53/+82
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4261 from matrix-org/rav/docker/remove_log_file	Richard van der Hoff	2018-12-04	2	-3/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove obsolete settings from docker homeserver.yaml
\| * \| \| \| \| \|	Remove obsolete settings from docker homeserver.yaml	Richard van der Hoff	2018-12-04	2	-3/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These aren't used, because we have a `log_config` setting.
* \| \| \| \| \|	Merge pull request #4005 from matrix-org/michaelkaye/move_to_docker_label	Richard van der Hoff	2018-12-04	1	-8/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Use labels to tag builds with their SHA1 version.
\| * \| \| \| \|	Use labels to tag builds with their SHA1 version.	Michael Kaye	2018-10-04	1	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The additional sha1 tagged builds in docker hub are messy, so instead tag the build with the SHA1 version.
* \| \| \| \| \|	Add an option to enable recording IPs for appservice users (#3831)	Travis Ralston	2018-12-04	3	-9/+26
\| \| \| \| \| \|
* \| \| \| \| \|	Fix non-ASCII pushrules (#4248)	Amber Brown	2018-12-04	2	-12/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #4210 from axelsimon/patch-1	Richard van der Hoff	2018-12-04	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace mentions of Vector with Riot
\| * \| \| \| \| \|	Replace mentions of Vector with Riot	axel simon	2018-11-20	1	-2/+2
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/vector-im/vector-web/issues/1977 --> https://github.com/vector-im/riot-web/issues/1977 And mention of Vector as a client replaced with Riot.
* \| \| \| \| \|	Add an option to disable search for homeservers which may not be interested ↵	Travis Ralston	2018-12-04	4	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in it (#4230) This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data.