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

	Commit message (Collapse)	Author	Age	Files	Lines
*	changelog a bump version	Neil Johnson	2018-06-08	1	-1/+1
\|
*	Fix event filtering in get_missing_events handler	Richard van der Hoff	2018-06-08	1	-0/+4
\|
*	bump version and changelog	Neil Johnson	2018-06-06	1	-1/+1
\|
*	Merge commit 'b7e7fd2' into release-v0.31.0	Richard van der Hoff	2018-06-06	2	-5/+8
\|\
\| *	Fix replication metrics	Richard van der Hoff	2018-06-04	1	-2/+2
\| \| \| \| \| \| \| \|	fix bug introduced in #3256
\| *	Hopefully, fix LaterGuage error handling	Richard van der Hoff	2018-06-04	1	-3/+6
\| \|
* \|	bump version and changelog v0.31.0-rc1	Neil Johnson	2018-06-04	1	-1/+1
\|/
*	federation/send_queue.py: fix usage of LaterGauge	Ivan Shapovalov	2018-06-03	1	-1/+1
\| \| \| \| \|	Fixes a startup crash due to commit df9f72d9e5fe264b86005208e0f096156eb03e4b "replacing portions".
*	Merge pull request #3317 from ↵	Richard van der Hoff	2018-06-01	1	-0/+3
\|\ \| \| \| \| \| \| \| \|	thegcat/feature/3312-add_ipv6_to_blacklist_example_config Add private IPv6 addresses to example config for url preview blacklist
\| *	Add private IPv6 addresses to preview blacklist #3312	Felix Schäfer	2018-06-01	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The added addresses are expected to be local or loopback addresses and shouldn't be spidered for previews. Signed-off-by: Felix Schäfer <felix@thegcat.net>
* \|	Merge pull request #3264 from matrix-org/neil/sign-up-stats	Neil Johnson	2018-06-01	4	-1/+60
\|\ \ \| \| \| \| \| \|	daily user type phone home stats
\| * \|	remove unnecessary INSERT	Neil Johnson	2018-06-01	1	-1/+0
\| \| \|
\| * \|	create users index on creation_ts	Neil Johnson	2018-05-29	1	-0/+20
\| \| \|
\| * \|	create index in background	Neil Johnson	2018-05-29	1	-0/+7
\| \| \|
\| * \|	bump version	Neil Johnson	2018-05-29	1	-1/+1
\| \| \|
\| * \|	daily user type phone home stats	Neil Johnson	2018-05-22	2	-0/+33
\| \| \|
* \| \|	Handle RRs which arrive before their events	Richard van der Hoff	2018-06-01	1	-25/+19
\| \| \|
* \| \|	Ignore depth when updating read-receipts	Richard van der Hoff	2018-06-01	1	-30/+37
\| \|/ \|/\| \| \| \| \|	Order read receipts by stream ordering instead of depth
* \|	Run Prometheus on a different port, optionally. (#3274)	Amber Brown	2018-05-31	15	-15/+126
\| \|
* \|	Consistently use six's iteritems and wrap lazy keys/values in list() if ↵	Amber Brown	2018-05-31	29	-101/+116
\| \| \| \| \| \| \| \|	they're not meant to be lazy (#3307)
* \|	Merge pull request #3303 from NotAFile/py3-memoryview	Amber Brown	2018-05-30	3	-6/+30
\|\ \ \| \| \| \| \| \|	use memoryview in py3
\| * \|	add remaining memoryview changes	Adrian Tschira	2018-05-29	2	-4/+12
\| \| \|
\| * \|	use memoryview in py3	Adrian Tschira	2018-05-29	2	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
* \| \|	Merge pull request #3281 from NotAFile/py3-six-isinstance	Amber Brown	2018-05-30	3	-13/+18
\|\ \ \ \| \| \| \| \| \| \| \|	remaining isintance fixes
\| * \| \|	pep8	Adrian Tschira	2018-05-29	1	-0/+1
\| \| \| \|
\| * \| \|	fix recursion error	Adrian Tschira	2018-05-24	1	-7/+5
\| \| \| \|
\| * \| \|	remaining isintance fixes	Adrian Tschira	2018-05-24	3	-8/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
* \| \| \|	Update some comments and docstrings in SyncHandler	Richard van der Hoff	2018-05-29	1	-1/+11
\| \| \| \|
* \| \| \|	Exempt AS-registered users from doing gdpr	Richard van der Hoff	2018-05-29	2	-0/+4
\| \|/ / \|/\| \|
* \| \|	pep8	Matthew Hodgson	2018-05-29	1	-0/+1
\| \| \|
* \| \|	disable CPUMetrics if no /proc/self/stat	Matthew Hodgson	2018-05-29	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	fixes build on macOS again
* \| \|	fix up tests	Amber Brown	2018-05-28	1	-3/+3
\| \| \|
* \| \|	update to more consistently use seconds in any metrics or logging	Amber Brown	2018-05-28	4	-38/+38
\| \| \|
* \| \|	invalid syntax :(	Amber Brown	2018-05-28	1	-2/+1
\| \| \|
* \| \|	add comment about why unreg	Amber Brown	2018-05-28	1	-0/+2
\| \| \|
* \| \|	update metrics to be in seconds	Amber Brown	2018-05-28	4	-37/+38
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/develop' into 3218-official-prom	Amber Brown	2018-05-28	42	-174/+353
\|\ \ \
\| * \| \|	Fix default for send_server_notice_to_guests	Richard van der Hoff	2018-05-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bool("False") == True...
\| * \| \|	Avoid sending consent notice to guest users	Richard van der Hoff	2018-05-25	2	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	we think it makes sense not to send the notices to guest users.
\| * \| \|	Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room	Richard van der Hoff	2018-05-25	1	-10/+14
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Let users leave the server notice room after joining
\| \| * \| \|	Let users leave the server notice room after joining	Richard van der Hoff	2018-05-25	1	-10/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They still can't reject invites, but we let them leave it.
\| * \| \| \|	Merge pull request #3283 from NotAFile/py3-state	Amber Brown	2018-05-24	1	-23/+25
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	py3-ize state.py
\| \| * \| \| \|	py3-ize state.py	Adrian Tschira	2018-05-24	1	-23/+25
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge pull request #3279 from NotAFile/py3-more-iteritems	Amber Brown	2018-05-24	1	-4/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	more six iteritems
\| \| * \| \| \|	more iteritems	Adrian Tschira	2018-05-24	1	-4/+6
\| \| \|/ / /
\| * / / /	Misc. py3 fixes	Adrian Tschira	2018-05-24	5	-11/+13
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \|	Merge pull request #3278 from NotAFile/py3-storage-base	Amber Brown	2018-05-24	1	-17/+22
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Py3 storage/_base.py
\| \| * \| \|	Py3 storage/_base.py	Adrian Tschira	2018-05-24	1	-17/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \|	Merge pull request #3244 from NotAFile/py3-six-4	Amber Brown	2018-05-24	15	-49/+69
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	replace some iteritems with six
\| \| * \| \| \|	replace some iteritems with six	Adrian Tschira	2018-05-19	15	-49/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \|	Merge pull request #3246 from NotAFile/py3-repr-string	Amber Brown	2018-05-24	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use repr, not str
\| \| * \| \| \| \|	use repr, not str	Adrian Tschira	2018-05-19	1	-1/+1
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \|	Merge pull request #3247 from NotAFile/py3-misc	Amber Brown	2018-05-24	3	-5/+18
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Misc Python3 fixes
\| \| * \| \| \| \|	use stand-in value if maxint is not available	Adrian Tschira	2018-05-19	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| \| * \| \| \| \|	fix py3 intern and remove unnecessary py3 encode	Adrian Tschira	2018-05-19	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
\| \| * \| \| \| \|	py3-ize url preview	Adrian Tschira	2018-05-19	1	-3/+5
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #3245 from NotAFile/batch-iter	Amber Brown	2018-05-24	1	-0/+18
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|	Add batch_iter to utils
\| \| * \| \| \|	Add batch_iter to utils	Adrian Tschira	2018-05-19	1	-0/+18
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's a frequent idiom I noticed where an iterable is split up into a number of chunks/batches. Unfortunately that method does not work with iterators like dict.keys() in python3. This implementation works with iterators. Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \|	Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir	David Baker	2018-05-24	2	-0/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove users from user directory on deactivate
\| \| * \| \| \|	Remove users from user directory on deactivate	David Baker	2018-05-24	2	-0/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #3243 from NotAFile/py3-six-3	Erik Johnston	2018-05-24	6	-11/+23
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace some more comparisons with six
\| \| * \| \| \| \|	Replace some more comparisons with six	Adrian Tschira	2018-05-19	6	-11/+23
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plus a bonus b"" string I missed last time Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \|	Merge branch 'master' into develop	Neil Johnson	2018-05-24	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| \| * \| \| \|	bump version	Neil Johnson	2018-05-24	1	-1/+1
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge pull request #3261 from matrix-org/erikj/pagination_fixes	Erik Johnston	2018-05-24	1	-9/+22
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix federation backfill bugs
\| \| * \| \| \|	Use iter* methods	Erik Johnston	2018-05-22	1	-7/+7
\| \| \| \| \| \|
\| \| * \| \| \|	Fix that states is a dict of dicts	Erik Johnston	2018-05-22	1	-1/+4
\| \| \| \| \| \|
\| \| * \| \| \|	get_domains_from_state returns list of tuples	Erik Johnston	2018-05-22	1	-2/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #3267 from matrix-org/erikj/iter_filter	Erik Johnston	2018-05-24	1	-5/+5
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|	Use iter* methods for _filter_events_for_server
\| \| * \| \| \|	s/values/itervalues/	Erik Johnston	2018-05-23	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Use iter* methods for _filter_events_for_server	Erik Johnston	2018-05-23	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url	Richard van der Hoff	2018-05-24	2	-6/+26
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow overriding the server_notices user's avatar
\| \| * \| \| \| \|	Allow overriding the server_notices user's avatar	Richard van der Hoff	2018-05-23	2	-6/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	probably should have done this in the first place, like @turt2live suggested.
\| * \| \| \| \| \|	Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri	Richard van der Hoff	2018-05-23	4	-8/+55
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages	Richard van der Hoff	2018-05-23	3	-7/+50
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support for putting %(consent_uri)s in messages
\| \| \| * \| \| \| \|	Support for putting %(consent_uri)s in messages	Richard van der Hoff	2018-05-23	3	-7/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it possible to put the URI in the error message and the server notice that get sent by the server
\| \| * \| \| \| \| \|	fix typo	Richard van der Hoff	2018-05-23	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Block attempts to send server notices to remote users	Richard van der Hoff	2018-05-23	1	-0/+4
\| \| \|/ / / / /
\| * / / / / /	Use the localpart in the consent uri	Richard van der Hoff	2018-05-23	1	-1/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... because it's shorter.
\| * / / / /	bump version and changelog	Neil Johnson	2018-05-23	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Remove unused string formatting param	Erik Johnston	2018-05-22	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Don't support limitless pagination	Erik Johnston	2018-05-22	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The pagination storage function supported not specifiying a limit on the number of events returned. This was triggered when using the search or context API with a limit of zero, which the storage function took to mean not being limited.
\| * \| \| \|	fix synchrotron	hera	2018-05-22	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	custom error code for not leaving server notices room	Richard van der Hoff	2018-05-22	2	-0/+2
\| \| \| \| \|
\| * \| \| \|	comment typo	David Baker	2018-05-22	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	pepeightttt	Amber Brown	2018-05-23	1	-0/+1
\| \| \| \|
* \| \| \|	add back CPU metrics	Amber Brown	2018-05-23	1	-1/+35
\| \| \| \|
* \| \| \|	fixes	Amber Brown	2018-05-23	3	-13/+13
\| \| \| \|
* \| \| \|	more cleanup	Amber Brown	2018-05-22	3	-9/+11
\| \| \| \|
* \| \| \|	cleanup	Amber Brown	2018-05-22	9	-29/+64
\| \| \| \|
* \| \| \|	cleanup pep8 errors	Amber Brown	2018-05-22	5	-37/+114
\| \| \| \|
* \| \| \|	fixes	Amber Brown	2018-05-22	7	-24/+52
\| \| \| \|
* \| \| \|	fix the test failures	Amber Brown	2018-05-22	1	-1/+1
\| \| \| \|
* \| \| \|	cleanups, self-registration	Amber Brown	2018-05-22	3	-19/+12
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/develop' into 3218-official-prom	Amber Brown	2018-05-22	46	-203/+1633
\|\\| \| \|
\| * \| \|	Merge pull request #3262 from matrix-org/rav/has_already_consented	Richard van der Hoff	2018-05-22	1	-4/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add a 'has_consented' template var to consent forms
\| \| * \| \|	Add a 'has_consented' template var to consent forms	Richard van der Hoff	2018-05-22	1	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #3260
\| \| * \| \|	Enable auto-escaping for the consent templates	Richard van der Hoff	2018-05-22	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... to reduce the risk of somebody introducing an html injection attack...
\| * \| \| \|	Fix dependency on jinja2	Richard van der Hoff	2018-05-22	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delay the import of ConsentResource, so that we can get away without jinja2 if people don't have the consent resource enabled. Fixes #3259
\| * / /	Reject attempts to send event before privacy consent is given	Richard van der Hoff	2018-05-22	5	-2/+178
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given.
\| * \|	Merge pull request #3236 from matrix-org/rav/consent_notice	Richard van der Hoff	2018-05-22	13	-18/+322
\| \|\ \ \| \| \| \| \| \| \| \|	Send users a server notice about consent
\| \| * \|	Stub out ServerNoticesSender on the workers	Richard van der Hoff	2018-05-22	6	-8/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... and have the sync endpoints call it directly rather than obsure indirection via PresenceHandler
\| \| * \|	Move consent config parsing into ConsentConfig	Richard van der Hoff	2018-05-22	3	-14/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	turns out we need to reuse this, so it's better in the config class.
\| \| * \|	Send users a server notice about consent	Richard van der Hoff	2018-05-22	9	-8/+246
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user first syncs, we will send them a server notice asking them to consent to the privacy policy if they have not already done so.
\| \| * \|	Rename 'version' param on user consent config	Richard van der Hoff	2018-05-22	2	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	we're going to use it for the version we require too.
\| * \| \|	Comment	Erik Johnston	2018-05-22	1	-1/+1
\| \| \| \|
\| * \| \|	Fix logcontext resource usage tracking	Erik Johnston	2018-05-22	1	-11/+27
\| \| \| \|
\| * \| \|	Merge pull request #3252 from matrix-org/erikj/in_flight_requests	Erik Johnston	2018-05-22	2	-2/+162
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Add in flight request metrics
\| \| * \|	Don't store context	Erik Johnston	2018-05-22	1	-8/+5
\| \| \| \|
\| \| * \|	Move in_flight_requests_count to be a callback metric	Erik Johnston	2018-05-22	1	-10/+21
\| \| \| \|
\| \| * \|	Add in flight request metrics	Erik Johnston	2018-05-21	2	-2/+154
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	This tracks CPU and DB usage while requests are in flight, rather than when we write the response.
\| * \|	Merge pull request #3255 from matrix-org/rav/fix_transactions	Richard van der Hoff	2018-05-21	1	-21/+21
\| \|\ \ \| \| \| \| \| \| \| \|	Stop the transaction cache caching failures
\| \| * \|	Fix logcontext leak in HttpTransactionCache	Richard van der Hoff	2018-05-21	1	-25/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ONE DAY I WILL PURGE THE WORLD OF THIS EVIL
\| \| * \|	Stop the transaction cache caching failures	Richard van der Hoff	2018-05-21	1	-9/+13
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The transaction cache has some code which tries to stop it caching failures, but if the callback function failed straight away, then things would happen backwards and we'd end up with the failure stuck in the cache.
\| * /	Tighter filtering for user_daily_visits	Neil Johnson	2018-05-18	1	-1/+5
\| \|/
\| *	fix psql compatability bug	Neil Johnson	2018-05-18	1	-1/+1
\| \|
\| *	Merge branch 'master' into develop	Neil Johnson	2018-05-18	1	-1/+1
\| \|\
\| * \	Merge pull request #3232 from matrix-org/rav/server_notices_room	Richard van der Hoff	2018-05-18	10	-7/+309
\| \|\ \ \| \| \| \| \| \| \| \|	Infrastructure for a server notices room
\| \| * \|	Better docstrings	Richard van der Hoff	2018-05-18	1	-0/+16
\| \| \| \|
\| \| * \|	Make sure we reject attempts to invite the notices user	Richard van der Hoff	2018-05-18	3	-0/+20
\| \| \| \|
\| \| * \|	Replace inline docstrings with "Attributes" in class docstring	Richard van der Hoff	2018-05-18	1	-23/+15
\| \| \| \|
\| \| * \|	fix missing yield for server_notices_room	Richard van der Hoff	2018-05-17	1	-3/+4
\| \| \| \|
\| \| * \|	Infrastructure for a server notices room	Richard van der Hoff	2018-05-17	9	-7/+280
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Server Notices use a special room which the user can't dismiss. They are created on demand when some other bit of the code calls send_notice. (This doesn't actually do much yet becuse we don't call send_notice anywhere)
\| * \| \|	Merge pull request #3235 from matrix-org/rav/fix_receipts_deferred	Richard van der Hoff	2018-05-18	1	-7/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix error in handling receipts
\| \| * \| \|	Fix error in handling receipts	Richard van der Hoff	2018-05-18	1	-7/+11
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes an error which has been happening ever since #2158 (v0.21.0-rc1): > TypeError: argument of type 'ObservableDeferred' is not iterable fixes #3234
\| * \| \|	Merge pull request #3233 from matrix-org/rav/remove_dead_code	Richard van der Hoff	2018-05-18	1	-55/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Remove unused `update_external_syncs`
\| \| * \| \|	Remove unused `update_external_syncs`	Richard van der Hoff	2018-05-17	1	-55/+0
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	This method isn't used anywhere. Burninate it.
\| * \| \|	Merge pull request #3221 from matrix-org/erikj/purge_token	Erik Johnston	2018-05-18	3	-37/+69
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Make purge_history operate on tokens
\| \| * \|	Clarify comment	Erik Johnston	2018-05-16	1	-1/+2
\| \| \| \|
\| \| * \|	Comments	Erik Johnston	2018-05-16	1	-0/+8
\| \| \| \|
\| \| * \|	Move and rename variable	Erik Johnston	2018-05-16	1	-3/+3
\| \| \| \|
\| \| * \|	Make purge_history operate on tokens	Erik Johnston	2018-05-15	3	-21/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As we're soon going to change how topological_ordering works
\| \| * \|	Use events_to_purge table rather than token	Erik Johnston	2018-05-15	1	-15/+34
\| \| \| \|
\| * \| \|	Merge pull request #3225 from matrix-org/rav/move_creation_handler	Richard van der Hoff	2018-05-17	6	-11/+19
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Move RoomCreationHandler out of synapse.handlers.Handlers
\| \| * \| \|	Move RoomCreationHandler out of synapse.handlers.Handlers	Richard van der Hoff	2018-05-17	6	-11/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handlers is deprecated nowadays, so let's move this out before I add a new dependency on it. Also fix the docstrings on create_room.
\| * \| \| \|	Merge pull request #3212 from matrix-org/erikj/epa_stream	Erik Johnston	2018-05-17	2	-38/+16
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use stream rather depth ordering for push actions
\| \| * \| \| \|	Use stream rather depth ordering for push actions	Erik Johnston	2018-05-11	2	-38/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This simplifies things as it is, but will also allow us to change the way we traverse topologically without having to update the way push actions work.
\| * \| \| \| \|	Merge branch 'master' into develop	Neil Johnson	2018-05-16	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #3163 from matrix-org/cohort_analytics	Neil Johnson	2018-05-16	6	-5/+121
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user visit data
\| \| * \| \| \| \|	remove empty line	Neil Johnson	2018-05-16	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	remove unused method recurring_user_daily_visit_stats	Neil Johnson	2018-05-16	1	-3/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	style and further contraining query	Neil Johnson	2018-05-16	1	-8/+12
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	pep8	Neil Johnson	2018-05-15	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Limit query load of generate_user_daily_visits	Neil Johnson	2018-05-15	2	-27/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The aim is to keep track of when it was last called and only query from that point in time
\| \| * \| \| \| \|	instead of inserting user daily visit data at the end of the day, instead ↵	Neil Johnson	2018-05-14	2	-43/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	insert incrementally through the day
\| \| * \| \| \| \|	Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵	Neil Johnson	2018-05-14	95	-1117/+1616
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cohort_analytics
\| \| * \| \| \| \| \|	remove user agent from data model, will just join on user_ips	Neil Johnson	2018-05-01	1	-12/+11
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	add inidexes based on usage	Neil Johnson	2018-05-01	1	-6/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	10 mins seems more reasonable that every minute	Neil Johnson	2018-05-01	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	pep8	Neil Johnson	2018-04-25	1	-3/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Generate user daily stats	Neil Johnson	2018-04-25	6	-5/+112
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #3213 from matrix-org/rav/consent_handler	Richard van der Hoff	2018-05-16	11	-5/+395
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|	ConsentResource to gather policy consent from users
\| \| * \| \| \| \| \|	ConsentResource to gather policy consent from users	Richard van der Hoff	2018-05-15	11	-5/+395
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully there are enough comments and docs in this that it makes sense on its own.
* \| \| \| \| \| \| \|	rest of the changes	Amber Brown	2018-05-21	6	-145/+68
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	replacing portions	Amber Brown	2018-05-21	22	-414/+265
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	don't need the resource portion	Amber Brown	2018-05-21	1	-23/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	look at the Prometheus metrics instead	Amber Brown	2018-05-21	1	-5/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	remove old metrics libs	Amber Brown	2018-05-21	2	-450/+0
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	bump version, change log	Neil Johnson	2018-05-17	1	-1/+1
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	bump version and changelog for 0.29.0 v0.29.0	Neil Johnson	2018-05-16	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	v0.29.0-rc1: bump version and change log v0.29.0-rc1	Neil Johnson	2018-05-14	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate	David Baker	2018-05-14	3	-2/+143
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Part user from rooms on account deactivate
\| * \| \| \|	Catch failure to part user from room	David Baker	2018-05-10	1	-7/+13
\| \| \| \| \|
\| * \| \| \|	Many docstrings	David Baker	2018-05-10	2	-0/+36
\| \| \| \| \|
\| * \| \| \|	Oops, don't call function passed to run_in_background	David Baker	2018-05-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Prefix internal functions	David Baker	2018-05-09	1	-7/+7
\| \| \| \| \|
\| * \| \| \|	Add the schema file	David Baker	2018-05-09	1	-0/+25
\| \| \| \| \|
\| * \| \| \|	Indent fail	David Baker	2018-05-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Part deactivated users in the background	David Baker	2018-05-09	2	-1/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One room at a time so we don't take out the whole server with leave events, and restart at server restart.
\| * \| \| \|	Part user from rooms on account deactivate	David Baker	2018-05-08	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This implements this very crudely: this probably isn't viable because parting a user from all their rooms could take a long time, and if the HS gets restarted in that time the process will be aborted.
* \| \| \| \|	Merge pull request #3208 from matrix-org/rav/more_refactor_request_handler	Richard van der Hoff	2018-05-11	23	-27/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Set Server header in SynapseRequest
\| * \| \| \| \|	Set Server header in SynapseRequest	Richard van der Hoff	2018-05-10	23	-27/+28
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(instead of everywhere that writes a response. Or rather, the subset of places which write responses where we haven't forgotten it). This also means that we don't have to have the mysterious version_string attribute in anything with a request handler. Unfortunately it does mean that we have to pass the version string wherever we instantiate a SynapseSite, which has been c&ped 150 times, but that is code that ought to be cleaned up anyway really.
* \| \| \| \|	Merge pull request #3209 from damir-manapov/master	Richard van der Hoff	2018-05-11	1	-2/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	transaction_id, destination defined twice
\| * \| \| \|	transaction_id, destination twice	Damir Manapov	2018-05-10	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Remove redundant request_handler decorator	Richard van der Hoff	2018-05-10	7	-38/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is needless complexity; we might as well use the wrapper directly. Also rename wrap_request_handler->wrap_json_request_handler.
* \| \| \| \|	Factor wrap_request_handler_with_logging out of wrap_request_handler	Richard van der Hoff	2018-05-10	1	-54/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... so that it can be used on non-JSON endpoints
* \| \| \| \|	Remove include_metrics param	Richard van der Hoff	2018-05-10	1	-17/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The metrics are now available via the request, so this is redundant and can go away at last.
* \| \| \| \|	Move outgoing_responses_counter handling to RequestMetrics	Richard van der Hoff	2018-05-10	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it's much neater there.
* \| \| \| \|	Bump requests_counter in wrapped_request_handler	Richard van der Hoff	2018-05-10	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	less magic
* \| \| \| \|	Move RequestMetrics handling into SynapseRequest.processing()	Richard van der Hoff	2018-05-10	2	-24/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It fits quite nicely here, and opens the path to getting rid of the "include_metrics" mess.
* \| \| \| \|	Make RequestMetrics take a raw time rather than a clock	Richard van der Hoff	2018-05-10	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... which is going to make it easier to move around.
* \| \| \| \|	Move request_id management into SynapseRequest	Richard van der Hoff	2018-05-10	2	-15/+25
\| \| \| \| \|
* \| \| \| \|	Move RequestsMetrics to its own file	Richard van der Hoff	2018-05-09	2	-124/+151
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is useful in its own right, because server.py is full of stuff; but more importantly, I want to do some refactoring that will cause a circular reference as it is.
* \| \| \|	Merge pull request #3199 from matrix-org/erikj/pagination_sync	Erik Johnston	2018-05-09	2	-45/+54
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Refactor sync APIs to reuse pagination API
\| * \| \| \|	Add comment to sync as to why code path is split	Erik Johnston	2018-05-09	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Refactor sync APIs to reuse pagination API	Erik Johnston	2018-05-09	2	-44/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The sync API often returns events in a topological rather than stream ordering, e.g. when the user joined the room or on initial sync. When this happens we can reuse existing pagination storage functions.
\| * \| \| \|	Don't unnecessarily require token to be stream token	Erik Johnston	2018-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows calling the `get_recent_event_ids_for_room` function in more situations.
* \| \| \| \|	Merge pull request #3198 from matrix-org/erikj/fixup_return_pagination	Erik Johnston	2018-05-09	3	-8/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor get_recent_events_for_room return type
\| * \| \| \| \|	Fix returned token is no longer a tuple	Erik Johnston	2018-05-09	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix up comment	Erik Johnston	2018-05-09	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-05-09	3	-8/+10
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	erikj/fixup_return_pagination
\| * \| \| \| \|	Refactor get_recent_events_for_room return type	Erik Johnston	2018-05-09	3	-7/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no reason to return a tuple of tokens when the last token is always the token passed as an argument. Changing it makes it consistent with other storage APIs
* \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-05-09	3	-8/+10
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	erikj/remove_membership_change
\| * \| \| \| \|	Merge pull request #3196 from matrix-org/erikj/pagination_return	Erik Johnston	2018-05-09	1	-28/+49
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor pagination DB API to return concrete type
\| \| * \| \| \| \|	Update comments	Erik Johnston	2018-05-09	1	-5/+6
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #3195 from matrix-org/erikj/pagination_refactor	Erik Johnston	2018-05-09	1	-51/+27
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor recent events func to use pagination func
\| * \ \ \ \ \	Merge pull request #3193 from matrix-org/erikj/pagination_refactor	Erik Johnston	2018-05-09	1	-110/+99
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|	Refactor /context to reuse pagination storage functions
\| * \| \| \| \| \|	Merge pull request #3190 from mujx/notif-token-fix	Richard van der Hoff	2018-05-08	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	notifications: Convert next_token to string according to the spec
\| \| * \| \| \| \| \|	notifications: Convert next_token to string according to the spec	Konstantinos Sideris	2018-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently the parameter is serialized as an integer. Signed-off-by: Konstantinos Sideris <sideris.konstantin@gmail.com>
\| * \| \| \| \| \| \|	Note that label values can be anything	Erik Johnston	2018-05-03	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix metrics that have integer value labels	Erik Johnston	2018-05-03	1	-1/+1
\| \|/ / / / / /
* \| \| \| / / /	Remove unused code path from member change DB func	Erik Johnston	2018-05-09	1	-24/+10
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The function is never called without a from_key, so we can remove all the handling for that scenario.
* \| \| \| \| \|	Refactor pagination DB API to return concrete type	Erik Johnston	2018-05-09	1	-28/+48
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to document what is being returned by the storage functions and what some functions expect as arguments.
* \| \| \| \|	Remove unused from_token param	Erik Johnston	2018-05-09	1	-7/+4
\| \| \| \| \|
* \| \| \| \|	Refactor recent events func to use pagination func	Erik Johnston	2018-05-09	1	-48/+27
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	This also removes a cache that is unlikely to ever get hit.
* \| \| \|	Fix up comments and make function private	Erik Johnston	2018-05-09	1	-7/+7
\| \| \| \|
* \| \| \|	Reuse existing pagination code for context API	Erik Johnston	2018-05-08	1	-75/+15
\| \| \| \|
* \| \| \|	Parse tokens before calling DB function	Erik Johnston	2018-05-08	1	-14/+18
\| \| \| \|
* \| \| \|	Only fetch required fields from database	Erik Johnston	2018-05-08	1	-1/+2
\| \| \| \|
* \| \| \|	Split paginate_room_events storage function	Erik Johnston	2018-05-08	1	-28/+72
\|/ / /
* \| \|	Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail	Richard van der Hoff	2018-05-03	137	-1294/+2609
\|\ \ \
\| * \ \	Merge pull request #3183 from matrix-org/rav/moar_logcontext_leaks	Richard van der Hoff	2018-05-03	1	-3/+14
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix logcontext leaks in rate limiter
\| \| * \| \|	Fix logcontext leaks in rate limiter	Richard van der Hoff	2018-05-03	1	-3/+14
\| \| \| \| \|
\| * \| \| \|	Merge pull request #3182 from Half-Shot/hs/fix-twisted-shutdown	Richard van der Hoff	2018-05-03	1	-3/+8
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'Unhandled Error' logs with Twisted 18.4
\| \| * \| \| \|	Don't abortConnection() if the transport connection has already closed.	Will Hunt	2018-05-03	1	-3/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #3178 from matrix-org/rav/fix_request_timeouts	Richard van der Hoff	2018-05-03	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|	fix http request timeout code
\| \| * \| \| \|	add missing param to cancelled_to_request_timed_out_error	Richard van der Hoff	2018-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gets two arguments, not one.
\| * \| \| \| \|	Merge pull request #3141 from matrix-org/erikj/fixup_state	Erik Johnston	2018-05-03	1	-37/+67
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor event storage to prepare for changes in state calculations
\| \| * \| \| \| \|	Fix up grammar	Erik Johnston	2018-05-03	1	-3/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Refactor event storage to not require state	Erik Johnston	2018-04-27	1	-37/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is in preparation for using contexts that may or may not have the current_state_ids set. This will allow us to avoid unnecessarily pulling out state for an event on the master process when using workers. We also add a check to see if the state groups of the old extremities are the same as the new ones.
\| * \| \| \| \| \|	Merge pull request #3161 from NotAFile/remove-v1auth	Richard van der Hoff	2018-05-03	3	-12/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Client-Server API return 403 for invalid token
\| \| * \| \| \| \| \|	Burminate v1auth	Adrian Tschira	2018-04-30	3	-12/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com>
\| * \| \| \| \| \| \|	Merge pull request #3175 from matrix-org/erikj/escape_metric_values	Erik Johnston	2018-05-03	1	-2/+28
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|	Escape label values in prometheus metrics
\| \| * \| \| \| \| \|	Make _escape_character take MatchObject	Erik Johnston	2018-05-02	1	-2/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Escape label values in prometheus metrics	Erik Johnston	2018-05-02	1	-2/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks	Richard van der Hoff	2018-05-02	1	-22/+38
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a class of logcontext leaks
\| \| * \| \| \| \| \| \|	Merge branch 'develop' into rav/more_logcontext_leaks	Richard van der Hoff	2018-05-02	2	-2/+2
\| \| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix a class of logcontext leaks	Richard van der Hoff	2018-05-02	1	-22/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So, it turns out that if you have a first `Deferred` `D1`, you can add a callback which returns another `Deferred` `D2`, and `D2` must then complete before any further callbacks on `D1` will execute (and later callbacks on `D1` get the result of `D2` rather than `D2` itself). So, `D1` might have `called=True` (as in, it has started running its callbacks), but any new callbacks added to `D1` won't get run until `D2` completes - so if you `yield D1` in an `inlineCallbacks` function, your `yield` will 'block'. In conclusion: some of our assumptions in `logcontext` were invalid. We need to make sure that we don't optimise out the logcontext juggling when this situation happens. Fortunately, it is easy to detect by checking `D1.paused`.
\| * \| \| \| \| \| \| \|	Fix logcontext leak in media repo	Richard van der Hoff	2018-05-02	2	-1/+4
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make FileResponder.write_to_consumer uphold the logcontext contract
\| * \| \| \| \| \| \|	Merge pull request #3168 from matrix-org/rav/fix_logformatter	Richard van der Hoff	2018-05-02	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect reference to StringIO
\| \| * \| \| \| \| \| \|	Fix incorrect reference to StringIO	Richard van der Hoff	2018-05-02	1	-1/+1
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was introduced in 4f2f5171
\| * \| \| \| \| \| \|	Merge branch 'master' into develop	Neil Johnson	2018-05-01	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| / / \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Update __init__.py	Neil Johnson	2018-05-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bump version
\| * \| \| \| \| \|	Merge branch 'release-v0.28.1' into develop	Richard van der Hoff	2018-05-01	3	-4/+26
\| \|\\| \| \| \| \| \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Merge commit '33f469b' into release-v0.28.1	Richard van der Hoff	2018-05-01	3	-4/+26
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Apply some limits to depth to counter abuse	Richard van der Hoff	2018-05-01	3	-4/+26
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* When creating a new event, cap its depth to 2^63 - 1 * When receiving events, reject any without a sensible depth As per https://docs.google.com/document/d/1I3fi2S-XnpO45qrpCsowZv8P8dHcNZ4fsBsbOW7KABI
\| \| * / / /	Miscellaneous fixes to python_dependencies	Richard van der Hoff	2018-05-01	1	-1/+19
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add some doc about wtf this thing does * pin Twisted to < 18.4 * add explicit dep on six (fixes #3089)
\| * \| \| \|	Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)	Will Hunt	2018-04-30	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #3135 Signed-off-by: Will Hunt will@half-shot.uk
\| * \| \| \|	add guard for None on purge_history api	Krombel	2018-04-30	1	-1/+14
\| \| \| \| \|
\| * \| \| \|	Merge pull request #3129 from matrix-org/matthew/fix_group_dups	Matthew Hodgson	2018-04-30	1	-0/+57
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	remove duplicates from groups tables
\| \| * \| \| \|	fix missing import	Matthew Hodgson	2018-04-28	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	pep8	Matthew Hodgson	2018-04-28	1	-3/+5
\| \| \| \| \| \|
\| \| * \| \| \|	make it work with sqlite	Matthew Hodgson	2018-04-28	2	-34/+54
\| \| \| \| \| \|
\| \| * \| \| \|	remove duplicates from groups tables	Matthew Hodgson	2018-04-25	1	-0/+34
\| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and rename inconsistently named indexes. Based on https://github.com/matrix-org/synapse/pull/3128 - thanks @vurpo\!
\| * \| \| \|	Merge pull request #3143 from matrix-org/rav/remove_redundant_preserve_fn	Richard van der Hoff	2018-04-30	1	-4/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant call to preserve_fn
\| \| * \| \| \|	Remove redundant call to preserve_fn	Richard van der Hoff	2018-04-30	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	submit_event_for_as doesn't return a deferred anyway, so this is pointless.
\| * \| \| \| \|	Merge pull request #3144 from ↵	Richard van der Hoff	2018-04-30	1	-1/+7
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/rav/run_in_background_exception_handling Trap exceptions thrown within run_in_background
\| \| * \| \| \| \|	Trap exceptions thrown within run_in_background	Richard van der Hoff	2018-04-27	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turn any exceptions that get thrown synchronously within run_in_background into Failures instead.
\| * \| \| \| \| \|	Merge pull request #3102 from NotAFile/py3-attributeerror	Richard van der Hoff	2018-04-30	1	-3/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make event properties raise AttributeError instead
\| \| * \| \| \| \| \|	add comment explaining attributeerror	Adrian Tschira	2018-04-30	1	-0/+3
\| \| \| \| \| \| \| \|