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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Write a clear restart indicator in logs	Richard van der Hoff	2018-06-20	2	-12/+19
\| \| \| \| \|	I'm fed up with never being able to find the point a server restarted in the logs.
*	spell gauge correctly	Matthew Hodgson	2018-06-16	1	-1/+1
\|
*	Merge branch 'master' into develop	Richard van der Hoff	2018-06-14	6	-47/+243
\|\
\| *	Merge tag 'v0.31.2'	Richard van der Hoff	2018-06-14	6	-47/+243
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SECURITY UPDATE: Prevent unauthorised users from setting state events in a room when there is no `m.room.power_levels` event in force in the room. (PR #3397) Discussion around the Matrix Spec change proposal for this change can be followed at https://github.com/matrix-org/matrix-doc/issues/1304.
\| \| *	link to spec proposal from changelog v0.31.2 github/release-v0.31.2 release-v0.31.2	Richard van der Hoff	2018-06-14	1	-0/+3
\| \| \|
\| \| *	v0.31.2	Richard van der Hoff	2018-06-14	1	-1/+2
\| \| \|
\| \| *	changelog for 0.31.2	Richard van der Hoff	2018-06-14	1	-0/+6
\| \| \|
\| \| *	Merge pull request #3397 from matrix-org/rav/adjust_auth_rules	Richard van der Hoff	2018-06-14	4	-46/+232
\| \| \|\ \| \| \| \| \| \| \| \|	Adjust event auth rules when there is no PL event
\| \| \| *	Fix broken unit test	Richard van der Hoff	2018-06-14	1	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need power levels for this test to do what it is supposed to do.
\| \| \| *	remove spurious debug	Richard van der Hoff	2018-06-14	1	-2/+0
\| \| \| \|
\| \| \| *	Make default state_default 50	Richard van der Hoff	2018-06-14	2	-20/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it so that, before there is a power-levels event in the room, you need a power level of at least 50 to send state. Partially addresses https://github.com/matrix-org/matrix-doc/issues/1192
\| \| \| *	Clarify interface for event_auth	Richard van der Hoff	2018-06-14	1	-18/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stop pretending that it returns a boolean, which just almost gave me a heart attack.
\| \| \| *	Refactor get_send_level to take a power_levels event	Richard van der Hoff	2018-06-14	2	-8/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it makes it easier for me to reason about
* \| \| \|	add a last seen metric (#3396)	Amber Brown	2018-06-14	1	-0/+21
\| \| \| \|
* \| \| \|	Remove run_on_reactor (#3395)	Amber Brown	2018-06-14	13	-63/+6
\| \| \| \|
* \| \| \|	Merge pull request #3368 from matrix-org/rav/fix_federation_client_host	Richard van der Hoff	2018-06-13	1	-14/+51
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix commandline federation_client to send the right Host header
\| * \| \| \|	Fix federation_client to send the right Host	Richard van der Hoff	2018-06-12	1	-14/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This appears to have stopped working since matrix.org moved to cloudflare. The Host header should match the name of the server, not whatever is in the SRV record.
* \| \| \| \|	Merge pull request #3389 from turt2live/travis/name_metrics	Amber Brown	2018-06-13	11	-11/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use the correct flag (enable_metrics) when warning about an incorrect metrics setup
\| * \| \| \| \|	The flag is named enable_metrics, not collect_metrics	Travis Ralston	2018-06-12	11	-11/+11
\| \|/ / / / \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
* \| \| \| \|	Merge pull request #3390 from turt2live/travis/appsvc-metrics	Amber Brown	2018-06-13	1	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Use the RegistryProxy for appservices too
\| * \| \| \|	Use the RegistryProxy for appservices too	Travis Ralston	2018-06-12	1	-1/+2
\|/ / / / \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
* \| \| \|	Merge pull request #3276 from matrix-org/dbkr/unbind	David Baker	2018-06-11	6	-16/+115
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove email addresses / phone numbers from ID servers when they're removed from synapse
\| * \| \| \|	pep8	David Baker	2018-06-06	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	More doc fixes	David Baker	2018-06-06	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	fix pep8	David Baker	2018-06-05	1	-3/+5
\| \| \| \| \|
\| * \| \| \|	doc fixes	David Baker	2018-06-05	2	-7/+7
\| \| \| \| \|
\| * \| \| \|	Docstring	David Baker	2018-06-04	1	-0/+14
\| \| \| \| \|
\| * \| \| \|	Fix comment	David Baker	2018-06-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Missing yield	David Baker	2018-06-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	docstring	David Baker	2018-06-04	1	-1/+9
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/develop' into dbkr/unbind	David Baker	2018-05-24	24	-74/+485
\| \|\ \ \ \
\| * \| \| \| \|	pep8	David Baker	2018-05-24	4	-8/+13
\| \| \| \| \| \|
\| * \| \| \| \|	comment	David Baker	2018-05-24	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Unbind 3pids when they're deleted too	David Baker	2018-05-24	2	-3/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Hit the 3pid unbind endpoint on deactivation	David Baker	2018-05-23	4	-12/+63
\| \| \| \| \| \|
* \| \| \| \| \|	fix idiotic typo in state res	Matthew Hodgson	2018-06-11	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into develop	Neil Johnson	2018-06-08	2	-1/+13
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge tag 'v0.31.1'	Neil Johnson	2018-06-08	3	-5/+20
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes in synapse v0.31.1 (2018-06-08) ======================================= v0.31.1 fixes a security bug in the ``get_missing_events`` federation API where event visibility rules were not applied correctly. We are not aware of it being actively exploited but please upgrade asap. Bug Fixes: * Fix event filtering in get_missing_events handler (PR #3371)
\| \| * \| \| \|	tweak changelog v0.31.1 github/release-v0.31.1 release-v0.31.1	Neil Johnson	2018-06-08	1	-2/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Update CHANGES.rst	Neil Johnson	2018-06-08	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	changelog a bump version	Neil Johnson	2018-06-08	2	-1/+11
\| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Fix event filtering in get_missing_events handler	Richard van der Hoff	2018-06-08	1	-0/+4
\| \| \| \| \|
\| \| * \| \|	fix various changelog bugs and typos	Matthew Hodgson	2018-06-08	1	-4/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3372 from matrix-org/rav/better_verification_logging	David Baker	2018-06-08	1	-6/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Try to log more helpful info when a sig verification fails
\| * \| \| \| \|	Try to log more helpful info when a sig verification fails	Richard van der Hoff	2018-06-08	1	-6/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Firstly, don't swallow the reason for the failure Secondly, don't assume all exceptions are verification failures Thirdly, log a bit of info about the key being used if debug is enabled
* \| \| \| \| \|	Merge pull request #3371 from matrix-org/rav/fix_get_missing_events	David Baker	2018-06-08	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix event filtering in get_missing_events handler
\| * \| \| \| \| \|	Fix event filtering in get_missing_events handler	Richard van der Hoff	2018-06-08	1	-0/+4
\| \|/ / / / /
* / / / / /	fix various changelog bugs and typos	Matthew Hodgson	2018-06-07	1	-4/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #3344 from Half-Shot/hs/as-metrics	Will Hunt	2018-06-07	1	-0/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add metrics to track appservice transactions
\| * \| \| \| \|	Let's try labels instead of label, that might work	Will Hunt	2018-06-05	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add metrics to track appservice transactions	Will Hunt	2018-06-05	1	-0/+22
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3363 from matrix-org/rav/fix_purge	Richard van der Hoff	2018-06-07	1	-7/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix event-purge-by-ts admin API
\| * \| \| \| \| \|	fix log	Richard van der Hoff	2018-06-07	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix event-purge-by-ts admin API	Richard van der Hoff	2018-06-07	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This got completely broken in 0.30. Fixes #3300.
* \| \| \| \| \| \|	Merge pull request #3355 from matrix-org/rav/fix_federation_backfill	Richard van der Hoff	2018-06-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix federation backfill from sqlite servers
\| * \| \| \| \| \| \|	Fix sql error in _get_state_groups_from_groups	Richard van der Hoff	2018-06-06	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If this was called with a `(type, None)` entry in types (which is supposed to return all state of type `type`), it would explode with a sql error.
* \| \| \| \| \| \|	Merge pull request #3356 from matrix-org/rav/add_missing_attr_dep	Amber Brown	2018-06-07	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that attr is installed
\| * \| \| \| \| \| \|	Add missing dependency on attr	Richard van der Hoff	2018-06-06	1	-0/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We've rcently added a dep on `attr`. I don't know why the CI didn't pick this up, but we should make it explicit anyway.
* \| \| \| \| \| \|	Merge branch 'master' into develop	Neil Johnson	2018-06-06	2	-1/+59
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge tag 'v0.31.0'	Neil Johnson	2018-06-06	113	-1642/+1426
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes in synapse v0.31.0 (2018-06-06) ====================================== Most notable change from v0.30.0 is to switch to python prometheus library to improve system stats reporting. WARNING this changes a number of prometheus metrics in a backwards-incompatible manner. For more details, see `docs/metrics-howto.rst <docs/metrics-howto.rst#removal-of-deprecated-metrics--time-based-counters-becoming-histograms-in-0310>`_. Bug Fixes: * Fix metric documentation tables (PR #3341) * Fix LaterGuage error handling (694968f) * Fix replication metrics (b7e7fd2) Changes in synapse v0.31.0-rc1 (2018-06-04) ========================================== Features: * Switch to the Python Prometheus library (PR #3256, #3274) * Let users leave the server notice room after joining (PR #3287) Changes: * daily user type phone home stats (PR #3264) * Use iter* methods for _filter_events_for_server (PR #3267) * Docs on consent bits (PR #3268) * Remove users from user directory on deactivate (PR #3277) * Avoid sending consent notice to guest users (PR #3288) * disable CPUMetrics if no /proc/self/stat (PR #3299) * Add local and loopback IPv6 addresses to url_preview_ip_range_blacklist (PR #3312) Thanks to @thegcat! * Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (PR #3307) * Add private IPv6 addresses to example config for url preview blacklist (PR #3317) Thanks to @thegcat! * Reduce stuck read-receipts: ignore depth when updating (PR #3318) * Put python's logs into Trial when running unit tests (PR #3319) Changes, python 3 migration: * Replace some more comparisons with six (PR #3243) Thanks to @NotAFile! * replace some iteritems with six (PR #3244) Thanks to @NotAFile! * Add batch_iter to utils (PR #3245) Thanks to @NotAFile! * use repr, not str (PR #3246) Thanks to @NotAFile! * Misc Python3 fixes (PR #3247) Thanks to @NotAFile! * Py3 storage/_base.py (PR #3278) Thanks to @NotAFile! * more six iteritems (PR #3279) Thanks to @NotAFile! * More Misc. py3 fixes (PR #3280) Thanks to @NotAFile! * remaining isintance fixes (PR #3281) Thanks to @NotAFile! * py3-ize state.py (PR #3283) Thanks to @NotAFile! * extend tox testing for py3 to avoid regressions (PR #3302) Thanks to @krombel! * use memoryview in py3 (PR #3303) Thanks to @NotAFile! Bugs: * Fix federation backfill bugs (PR #3261) * federation: fix LaterGauge usage (PR #3328) Thanks to @intelfx!
\| \| * \| \| \| \|	7 char sha in changelog v0.31.0 github/release-v0.31.0 release-v0.31.0	Neil Johnson	2018-06-06	1	-3/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-06-06	1	-4/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	bump version and changelog	Neil Johnson	2018-06-06	2	-3/+12
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix metric documentation tables (#3341)	Amber Brown	2018-06-06	1	-20/+30
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add note to changelog on prometheus metrics	Richard van der Hoff	2018-06-06	1	-1/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge commit 'b7e7fd2' into release-v0.31.0	Richard van der Hoff	2018-06-06	2	-5/+8
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	bump version and changelog v0.31.0-rc1	Neil Johnson	2018-06-04	2	-1/+47
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3349 from t3chguy/redact_as_request_token	Richard van der Hoff	2018-06-06	2	-3/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|	Redact AS tokens in log (fixes to #3327)
\| * \| \| \| \| \| \|	also redact __str__ of ApplicationService used for logging	Michael Telatynski	2018-06-06	1	-1/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	redact_uri in two missed log paths	Michael Telatynski	2018-06-06	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3347 from krombel/py3_extend_tox_2	Amber Brown	2018-06-06	1	-11/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update tox.ini to cover 292 succeeding tests
\| * \| \| \| \| \| \| \|	update tox.ini to cover 292 succeeding tests	Krombel	2018-06-05	1	-11/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-Off-By: Matthias Kesler <krombel@krombel.de>
* \| \| \| \| \| \| \| \|	Merge pull request #3348 from intelfx/fix-sortedcontainers	Amber Brown	2018-06-06	1	-27/+22
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	federation/send_queue.py: fix usage of sortedcontainers.SortedDict
\| * \| \| \| \| \| \| \| \|	federation/send_queue.py: fix usage of sortedcontainers.SortedDict	Ivan Shapovalov	2018-06-06	1	-27/+22
\| \|/ / / / / / / /
* / / / / / / / /	Fix metric documentation tables (#3341)	Amber Brown	2018-06-06	1	-20/+30
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #3327 from t3chguy/redact_as_request_token	Richard van der Hoff	2018-06-05	3	-9/+18
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip `access_token` from outgoing requests
\| * \| \| \| \| \| \|	factor out uri redaction into a method on http	Michael Telatynski	2018-06-05	3	-13/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Strip `access_token` from outgoing requests using existing regex	Michael Telatynski	2018-06-02	1	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3340 from ArchangeGabriel/patch-1	Richard van der Hoff	2018-06-05	1	-9/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc/postgres.rst: fix display of the last command block
\| * \| \| \| \| \| \| \|	doc/postgres.rest: fix displaying of the last command block	Bruno Pagani	2018-06-04	1	-9/+9
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also indent all of them with 4 spaces.
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2018-06-05	1	-0/+3
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #3290 from rubo77/patch-7	Richard van der Hoff	2018-05-30	1	-0/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to thorough instruction how to configure consent
\| \| * \| \| \| \| \| \|	remove trailing whitespace	Richard van der Hoff	2018-05-30	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	fix english and wrap comment	Richard van der Hoff	2018-05-30	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	add link to thorough instruction how to configure consent	Ruben Barkow	2018-05-25	1	-0/+2
\| \|/ / / / / / /
* \| \| \| \| / / /	Port to sortedcontainers (with tests!) (#3332)	Amber Brown	2018-06-06	6	-35/+241
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3324 from matrix-org/rav/remove_dead_method	Richard van der Hoff	2018-06-04	1	-26/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove was_forgotten_at
\| * \| \| \| \| \| \|	Remove was_forgotten_at	Richard van der Hoff	2018-06-01	1	-26/+0
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is unused. IT MUST DIE!!!1 ̧̪͈̱̹̳͖͙H̵̰̤̰͕̖e̛ ͚͉̗̼̞w̶̩̥͉̮h̩̺̪̩͘ͅọ͎͉̟ ̜̩͔̦̘ͅW̪̫̩̣̲͔̳a͏͔̳͖i͖͜t͓̤̠͓͙s̘̰̩̥̙̝ͅ ̲̠̬̥Be̡̙̫̦h̰̩i̛̫͙͔̭̤̗̲n̳͞d̸ ͎̻͘T̛͇̝̲̹̠̗ͅh̫̦̝ͅe̩̫͟ ͓͖̼W͕̳͎͚̙̥ą̙l̘͚̺͔͞ͅl̳͍̙̤̤̮̳.̢ ̟̺̜̙͉Z̤̲̙̙͎̥̝A͎̣͔̙͘L̥̻̗̳̻̳̳͢G͉̖̯͓̞̩̦O̹̹̺!̙͈͎̞̬ *
* \| \| \| \| \| \|	Merge pull request #3334 from matrix-org/rav/cache_factor_override	Richard van der Hoff	2018-06-04	4	-4/+18
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	Cache factor override system for specific caches
\| * \| \| \| \| \|	Add hacky cache factor override system	Erik Johnston	2018-06-04	4	-4/+18
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	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
\|/ / / / /
* \| \| \| \|	Put python's logs into Trial when running unit tests (#3319)	Amber Brown	2018-06-04	1	-13/+27
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3328 from intelfx/fix-metrics-LaterGauge-usage	Amber Brown	2018-06-04	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	federation: fix LaterGauge usage
\| * \| \| \|	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
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3318 from matrix-org/rav/ignore_depth_on_rrs	Richard van der Hoff	2018-06-01	1	-29/+30
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Ignore depth when updating read-receipts
\| * \| \| \| \|	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
* \| \| \| \|	code_style.rst: formatting	Richard van der Hoff	2018-05-31	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Run Prometheus on a different port, optionally. (#3274)	Amber Brown	2018-05-31	16	-26/+192
\| \| \| \| \|
* \| \| \| \|	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
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3304 from matrix-org/rav/exempt_as_users_from_gdpr	Richard van der Hoff	2018-05-29	3	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exempt AS-registered users from doing gdpr
\| * \| \| \| \| \| \|	fix tests	Richard van der Hoff	2018-05-29	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Exempt AS-registered users from doing gdpr	Richard van der Hoff	2018-05-29	2	-0/+4
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3302 from krombel/py3_extend_tox_testing	Richard van der Hoff	2018-05-29	1	-1/+28
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	extend tox testing for py3 to avoid regressions
\| * \| \| \| \| \|	extend tox testing for py3 to avoid regressions	Krombel	2018-05-29	1	-1/+28
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #3299 from matrix-org/matthew/macos-fixes	Amber Brown	2018-05-29	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disable CPUMetrics if no /proc/self/stat
\| * \| \| \| \| \|	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 another dumb typo	Matthew Hodgson	2018-05-29	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	fix dumb typo	Matthew Hodgson	2018-05-29	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3256 from matrix-org/3218-official-prom	Amber Brown	2018-05-28	40	-1311/+575
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch to the Python Prometheus library
\| * \| \| \| \| \|	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	47	-197/+686
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3288 from matrix-org/rav/no_spam_guests	Richard van der Hoff	2018-05-25	2	-1/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid sending consent notice to guest users
\| * \| \| \| \| \| \|	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	2	-12/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-12/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #3280 from NotAFile/py3-more-misc	Amber Brown	2018-05-24	5	-11/+13
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	More Misc. py3 fixes
\| * \| \| \| \| \| \|	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	2	-5/+24
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| / / \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Update CHANGES.rst v0.30.0 github/release-v0.30.0 release-v0.30.0	Neil Johnson	2018-05-24	1	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-05-24	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	update for v0.30.0	Neil Johnson	2018-05-24	1	-4/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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 branch 'release-v0.30.0' into develop	Richard van der Hoff	2018-05-24	8	-19/+128
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url	Richard van der Hoff	2018-05-24	3	-9/+32
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow overriding the server_notices user's avatar
\| \| * \| \| \| \| \| \|	Allow overriding the server_notices user's avatar	Richard van der Hoff	2018-05-23	3	-9/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	probably should have done this in the first place, like @turt2live suggested.
\| * \| \| \| \| \| \| \|	Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri	Richard van der Hoff	2018-05-23	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Use the localpart in the consent uri
\| \| * \| \| \| \| \| \|	Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri	Richard van der Hoff	2018-05-23	4	-8/+55
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Use the localpart in the consent uri	Richard van der Hoff	2018-05-23	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... because it's shorter.
\| * \| \| \| \| \| \| \| \|	Merge docs on consent bits from PR #3268 into release branch	Richard van der Hoff	2018-05-23	4	-23/+271
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #3270 from matrix-org/rav/block_remote_server_notices	Richard van der Hoff	2018-05-23	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|	Block attempts to send server notices to remote users
\| \| * \| \| \| \| \| \| \|	Block attempts to send server notices to remote users	Richard van der Hoff	2018-05-23	1	-0/+4
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	style v0.30.0-rc1	Neil Johnson	2018-05-23	1	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	bump version and changelog	Neil Johnson	2018-05-23	2	-1/+37
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3268 from matrix-org/rav/privacy_policy_docs	Richard van der Hoff	2018-05-23	4	-23/+271
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| / / / / / / \| \|/ / / / / /	Docs on consent bits
\| * \| \| \| \| \|	consent_tracking.md: clarify link	Richard van der Hoff	2018-05-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	minor post-review tweaks	Richard van der Hoff	2018-05-23	2	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	mention public_baseurl	Richard van der Hoff	2018-05-23	1	-0/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix wrapping	Richard van der Hoff	2018-05-23	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Using the manhole to send server notices	Richard van der Hoff	2018-05-23	1	-0/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Notes on the manhole	Richard van der Hoff	2018-05-23	1	-0/+43
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	consent_tracking: formatting etc	Richard van der Hoff	2018-05-23	1	-8/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	server_notices.md: fix link	Richard van der Hoff	2018-05-23	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	consent tracking docs	Richard van der Hoff	2018-05-23	3	-25/+154
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Some docs about server notices	Richard van der Hoff	2018-05-23	1	-0/+53
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #3265 from matrix-org/erikj/limit_pagination	Erik Johnston	2018-05-22	1	-9/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't support limitless pagination
\| * \| \| \| \| \|	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
\| \| \| \|
\| \| \| *	tests/metrics is gone now	Amber Brown	2018-05-22	1	-1/+1
\| \| \| \|
\| \| \| *	fixes	Amber Brown	2018-05-22	7	-24/+52
\| \| \| \|
\| \| \| *	fix the test failures	Amber Brown	2018-05-22	1	-1/+1
\| \| \| \|
\| \| \| *	update gitignore to remove some files that got put on my machine	Amber Brown	2018-05-22	1	-0/+3
\| \| \| \|
\| \| \| *	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	55	-210/+1780
\| \| \| \|\ \| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #3262 from matrix-org/rav/has_already_consented	Richard van der Hoff	2018-05-22	3	-5/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	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	3	-4/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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...
* \| \| \| \|	Merge pull request #3263 from matrix-org/rav/fix_jinja_dep	Richard van der Hoff	2018-05-22	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fix dependency on jinja2
\| * \| \| \|	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
* \| \| \|	Merge pull request #3257 from matrix-org/rav/fonx_on_no_consent	Richard van der Hoff	2018-05-22	6	-2/+179
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Reject attempts to send event before privacy consent is given
\| * \| \|	Reject attempts to send event before privacy consent is given	Richard van der Hoff	2018-05-22	6	-2/+179
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	15	-21/+331
\|\ \ \ \| \| \| \| \| \| \| \|	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	4	-15/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	11	-11/+255
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \|	Merge pull request #3258 from matrix-org/erikj/fixup_logcontext_rusage	Erik Johnston	2018-05-22	1	-11/+27
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix logcontext resource usage tracking
\| * \| \| \|	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	2	-21/+96
\|\ \ \ \| \| \| \| \| \| \| \|	Stop the transaction cache caching failures
\| * \| \|	Fix logcontext leak in HttpTransactionCache	Richard van der Hoff	2018-05-21	2	-25/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ONE DAY I WILL PURGE THE WORLD OF THIS EVIL
\| * \| \|	Stop the transaction cache caching failures	Richard van der Hoff	2018-05-21	2	-9/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \|	Merge pull request #3251 from matrix-org/cohort_analytics	Neil Johnson	2018-05-21	1	-1/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Tighter filtering for user_daily_visits
\| * \| \|	Tighter filtering for user_daily_visits	Neil Johnson	2018-05-18	1	-1/+5
\| \|/ /
* \| \|	Merge pull request #3239 from ptman/develop	Michael Kaye	2018-05-21	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|	Add lxml to docker image for web previews
\| * \|	Add lxml to docker image for web previews	Paul Tötterman	2018-05-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
* \| \|	Merge pull request #3241 from matrix-org/fix_user_visits_insertion	Neil Johnson	2018-05-18	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	fix psql compatability bug
\| * \|	fix psql compatability bug	Neil Johnson	2018-05-18	1	-1/+1
\|/ /
* \|	Merge branch 'master' into develop	Neil Johnson	2018-05-18	5	-19/+45
\|\ \
* \ \	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
\| \| \| \|