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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \|
\| \| * \|	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	3	-40/+18
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use stream rather depth ordering for push actions
\| \| * \| \| \|	Use stream rather depth ordering for push actions	Erik Johnston	2018-05-11	3	-40/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+71
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #3163 from matrix-org/cohort_analytics	Neil Johnson	2018-05-16	7	-5/+122
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	120	-1181/+2386
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	ignore atom editor python ide files	Neil Johnson	2018-04-25	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #3213 from matrix-org/rav/consent_handler	Richard van der Hoff	2018-05-16	14	-5/+446
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|	ConsentResource to gather policy consent from users
\| \| * \| \| \| \| \|	ConsentResource to gather policy consent from users	Richard van der Hoff	2018-05-15	14	-5/+446
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-337/+68
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	replacing portions	Amber Brown	2018-05-21	23	-414/+268
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge tag 'v0.29.1'	Neil Johnson	2018-05-18	4	-10/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes in synapse v0.29.1 (2018-05-17) ========================================== Changes: * Update docker documentation (PR #3222) Changes in synapse v0.29.0 (2018-05-16) =========================================== Not changes since v0.29.0-rc1 Changes in synapse v0.29.0-rc1 (2018-05-14) =========================================== Notable changes, a docker file for running Synapse (Thanks to @kaiyou!) and a closed spec bug in the Client Server API. Additionally further prep for Python 3 migration. Potentially breaking change: * Make Client-Server API return 401 for invalid token (PR #3161). This changes the Client-server spec to return a 401 error code instead of 403 when the access token is unrecognised. This is the behaviour required by the specification, but some clients may be relying on the old, incorrect behaviour. Thanks to @NotAFile for fixing this. Features: * Add a Dockerfile for synapse (PR #2846) Thanks to @kaiyou! Changes - General: * nuke-room-from-db.sh: added postgresql option and help (PR #2337) Thanks to @rubo77! * Part user from rooms on account deactivate (PR #3201) * Make 'unexpected logging context' into warnings (PR #3007) * Set Server header in SynapseRequest (PR #3208) * remove duplicates from groups tables (PR #3129) * Improve exception handling for background processes (PR #3138) * Add missing consumeErrors to improve exception handling (PR #3139) * reraise exceptions more carefully (PR #3142) * Remove redundant call to preserve_fn (PR #3143) * Trap exceptions thrown within run_in_background (PR #3144) Changes - Refactors: * Refactor /context to reuse pagination storage functions (PR #3193) * Refactor recent events func to use pagination func (PR #3195) * Refactor pagination DB API to return concrete type (PR #3196) * Refactor get_recent_events_for_room return type (PR #3198) * Refactor sync APIs to reuse pagination API (PR #3199) * Remove unused code path from member change DB func (PR #3200) * Refactor request handling wrappers (PR #3203) * transaction_id, destination defined twice (PR #3209) Thanks to @damir-manapov! * Refactor event storage to prepare for changes in state calculations (PR #3141) * Set Server header in SynapseRequest (PR #3208) * Use deferred.addTimeout instead of time_bound_deferred (PR #3127, #3178) * Use run_in_background in preference to preserve_fn (PR #3140) Changes - Python 3 migration: * Construct HMAC as bytes on py3 (PR #3156) Thanks to @NotAFile! * run config tests on py3 (PR #3159) Thanks to @NotAFile! * Open certificate files as bytes (PR #3084) Thanks to @NotAFile! * Open config file in non-bytes mode (PR #3085) Thanks to @NotAFile! * Make event properties raise AttributeError instead (PR #3102) Thanks to @NotAFile! * Use six.moves.urlparse (PR #3108) Thanks to @NotAFile! * Add py3 tests to tox with folders that work (PR #3145) Thanks to @NotAFile! * Don't yield in list comprehensions (PR #3150) Thanks to @NotAFile! * Move more xrange to six (PR #3151) Thanks to @NotAFile! * make imports local (PR #3152) Thanks to @NotAFile! * move httplib import to six (PR #3153) Thanks to @NotAFile! * Replace stringIO imports with six (PR #3154, #3168) Thanks to @NotAFile! * more bytes strings (PR #3155) Thanks to @NotAFile! Bug Fixes: * synapse fails to start under Twisted >= 18.4 (PR #3157) * Fix a class of logcontext leaks (PR #3170) * Fix a couple of logcontext leaks in unit tests (PR #3172) * Fix logcontext leak in media repo (PR #3174) * Escape label values in prometheus metrics (PR #3175, #3186) * Fix 'Unhandled Error' logs with Twisted 18.4 (PR #3182) Thanks to @Half-Shot! * Fix logcontext leaks in rate limiter (PR #3183) * notifications: Convert next_token to string according to the spec (PR #3190) Thanks to @mujx! * nuke-room-from-db.sh: fix deletion from search table (PR #3194) Thanks to @rubo77! * add guard for None on purge_history api (PR #3160) Thanks to @krombel!
\| * \ \ \ \ \ \	Merge branch 'release-v0.29.0' of https://github.com/matrix-org/synapse into ↵ v0.29.1 github/release-v0.29.0 release-v0.29.0	Neil Johnson	2018-05-18	2	-2/+8
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	release-v0.29.0
\| \| * \| \| \| \| \| \|	bump version, change log	Neil Johnson	2018-05-17	2	-2/+8
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	light grammar changes	Neil Johnson	2018-05-17	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Note that secrets need to be retained.	Michael Kaye	2018-05-17	1	-2/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Document macaroon env var correctly	Michael Kaye	2018-05-17	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Reference synapse docker image and docker-compose	Michael Kaye	2018-05-17	1	-2/+3
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #1756 from rubo77/patch-4	Richard van der Hoff	2018-05-17	1	-9/+23
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Add instructions how to setup the postgres user and clarify the final step
\| * \| \| \| \| \|	postgres.rst: Add instructions how to setup the postgres user and clarify ↵	rubo77	2018-05-17	1	-9/+23
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the final step
* \| \| \| \| \|	bump version and changelog for 0.29.0 v0.29.0	Neil Johnson	2018-05-16	2	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	further musical chairs	Neil Johnson	2018-05-14	1	-2/+3
\| \| \| \| \| \|
* \| \| \| \| \|	rearrange and collect related PRs	Neil Johnson	2018-05-14	1	-26/+27
\| \| \| \| \| \|
* \| \| \| \| \|	v0.29.0-rc1: bump version and change log v0.29.0-rc1	Neil Johnson	2018-05-14	2	-3/+65
\|/ / / / /
* \| \| \| \|	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 #2846 from kaiyou/feat-dockerfile	Michael Kaye	2018-05-11	10	-0/+541
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a Dockerfile for synapse
\| * \| \| \| \|	Add Docker packaging in the author list	kaiyou	2018-05-04	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into feat-dockerfile	kaiyou	2018-05-02	69	-496/+1028
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Make the logging level configurable	kaiyou	2018-05-01	2	-3/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix the documentation about 'POSTGRES_DB'	kaiyou	2018-05-01	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into feat-dockerfile	kaiyou	2018-04-14	51	-279/+965
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into feat-dockerfile	kaiyou	2018-04-08	179	-4356/+8696
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into feat-dockerfile	kaiyou	2018-03-17	27	-39/+46
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Disable logging to file and rely on the console when using Docker	kaiyou	2018-02-10	1	-8/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Explicitely provide the postgres password to synapse in the Compose example	kaiyou	2018-02-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove an accidentally committed test configuration	kaiyou	2018-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Generate macaroon and registration secrets, then store the results to the ↵	kaiyou	2018-02-10	2	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	data dir
\| * \| \| \| \| \| \| \| \|	Fix the path to the log config file	kaiyou	2018-02-09	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make SYNAPSE_MACAROON_SECRET_KEY a mandatory option	kaiyou	2018-02-09	2	-3/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Specify the Docker registry for the postgres image	kaiyou	2018-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Specify the Docker registry in the build tag	kaiyou	2018-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make it clear that the image has two modes of operation	kaiyou	2018-02-08	1	-5/+24
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update to Alpine 3.7 and switch to libressl	kaiyou	2018-02-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Enable email server configuration from environment variables	kaiyou	2018-02-08	2	-16/+24
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Honor the SYNAPSE_REPORT_STATS parameter in the Docker image	kaiyou	2018-02-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Disable the Web client in the Docker image	kaiyou	2018-02-08	2	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use 'synapse' as a default postgres user in Docker examples	kaiyou	2018-02-08	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor the start script to better handle mandatory parameters	kaiyou	2018-02-08	3	-24/+35
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename the permissions variable to avoid confusion	kaiyou	2018-02-08	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add some documentation about high performance storage	kaiyou	2018-02-08	1	-2/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make it clear that two modes are avaiable in the documentation, improve the ↵	kaiyou	2018-02-08	2	-9/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	compose file
\| * \| \| \| \| \| \| \| \|	Support loading application service files from /data/appservices/	kaiyou	2018-02-05	3	-2/+18
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add the non-tls port to the expose list	kaiyou	2018-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Only generate configuration files when necessary	kaiyou	2018-02-05	1	-5/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Do not copy documentation files to the Docker root folder	kaiyou	2018-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Point to the 'latest' tag in the Docker documentation	kaiyou	2018-02-05	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix a typo in the Docker README	kaiyou	2018-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Document the cache factor environment variable for Docker	kaiyou	2018-02-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add dynamic TURN configuration in the Docker image	kaiyou	2018-02-05	2	-2/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add dynamic recaptcha configuration in the Docker image	kaiyou	2018-02-05	2	-0/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove docker related files from the python manifest	kaiyou	2018-02-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Run the server as an unprivileged user	kaiyou	2018-02-04	2	-5/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix multiple typos	kaiyou	2018-02-04	3	-10/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add the build cache/ folder to gitignore	kaiyou	2018-02-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update sumperdump Docker readme to match this image properties	kaiyou	2018-02-04	1	-38/+64
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove etc/service files from rob's branch	kaiyou	2018-02-04	3	-131/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/rob/docker' into feat-dockerfile	kaiyou	2018-02-04	4	-0/+201
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	docker: s/matrix-org/matrixdotorg/g	Robert Swain	2017-09-29	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	docker: Initial Dockerfile and docker-compose.yaml	Robert Swain	2017-09-28	5	-0/+259
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Reuse environment variables of the postgres container	kaiyou	2018-02-04	2	-9/+14
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Provide an example docker compose file	kaiyou	2018-02-04	2	-0/+34
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Install the postgres dependencies	kaiyou	2018-02-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Support an external postgresql config in the Docker image	kaiyou	2018-02-04	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Generate shared secrets if not defined in the environment	kaiyou	2018-02-04	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Generate any missing keys before starting synapse	kaiyou	2018-02-04	1	-12/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Allow for a wheel cache and include missing files in the build	kaiyou	2018-02-04	3	-6/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add template config files for the Docker image	kaiyou	2018-02-03	2	-0/+217
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Initial commit including a Dockerfile for synapse	kaiyou	2018-02-03	2	-0/+45
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #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
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2018-05-11	0	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	missing word :\|	Matthew Hodgson	2018-05-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'release-v0.28.1'	Matthew Hodgson	2018-05-01	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \	Merge pull request #3203 from matrix-org/rav/refactor_request_handler	Richard van der Hoff	2018-05-10	9	-251/+339
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \|	Refactor request handling wrappers
\| * \| \| \| \| \| \| \| \| \|	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	4	-10/+22
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 pull request #3200 from matrix-org/erikj/remove_membership_change	Erik Johnston	2018-05-09	1	-24/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove unused code path from member change DB func
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-05-09	4	-10/+22
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 #3194 from rubo77/fix-nuke	Richard van der Hoff	2018-05-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nuke-room-from-db.sh: fix deletion from search table
\| * \| \| \| \| \| \| \| \| \| \| \| \|	nuke-room-from-db.sh: nuke from table event_search too	rubo77	2018-05-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Dont nuke non-existing table event_search_content	rubo77	2018-05-09	1	-1/+0
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	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 #2337 from rubo77/patch-5	Richard van der Hoff	2018-05-09	1	-1/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	nuke-room-from-db.sh: added postgresql option and help
\| * \| \| \| \| \| \| \| \| \| \| \| \|	nuke-room-from-db.sh: added postgresql option and help	rubo77	2018-05-09	1	-1/+11
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3186 from matrix-org/erikj/fix_int_values_metrics	Erik Johnston	2018-05-08	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Fix metrics that have integer value labels
\| * \| \| \| \| \| \| \| \| \| \| \| \|	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 pull request #3007 from matrix-org/rav/warn_on_logcontext_fail	Richard van der Hoff	2018-05-03	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make 'unexpected logging context' into warnings
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail	Richard van der Hoff	2018-05-03	173	-1459/+3290
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \| \| \|	Fix changes warning	Richard van der Hoff	2018-05-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Warn of potential client incompatibility from #3161	Richard van der Hoff	2018-05-03	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	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	7	-25/+24
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Client-Server API return 403 for invalid token
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Burminate v1auth	Adrian Tschira	2018-04-30	7	-25/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+48
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3170 from matrix-org/rav/more_logcontext_leaks	Richard van der Hoff	2018-05-02	2	-33/+93
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a class of logcontext leaks
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' into rav/more_logcontext_leaks	Richard van der Hoff	2018-05-02	6	-6/+71
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove spurious unittest.DEBUG	Richard van der Hoff	2018-05-02	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a class of logcontext leaks	Richard van der Hoff	2018-05-02	2	-33/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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`.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3174 from matrix-org/rav/media_repo_logcontext_leaks	Richard van der Hoff	2018-05-02	2	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix logcontext leak in media repo
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 #3172 from matrix-org/rav/fix_test_logcontext_leaks	Richard van der Hoff	2018-05-02	2	-3/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a couple of logcontext leaks in unit tests
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a couple of logcontext leaks in unit tests	Richard van der Hoff	2018-05-02	2	-3/+9
\|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... which were making other, innocent, tests, fail. Plus remove a spurious unittest.DEBUG which was making the output noisy.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3168 from matrix-org/rav/fix_logformatter	Richard van der Hoff	2018-05-02	2	-1/+39
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect reference to StringIO
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect reference to StringIO	Richard van der Hoff	2018-05-02	2	-1/+39
\| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was introduced in 4f2f5171
* \| \| \| \| \| \| \| \| \| \| \| \| \|	missing word :\|	Matthew Hodgson	2018-05-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'release-v0.28.1' into develop	Matthew Hodgson	2018-05-01	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fix markdown	Matthew Hodgson	2018-05-01	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Neil Johnson	2018-05-01	2	-2/+23
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / / \|/\| \| \| \| \| \| / / / / / / / \| \| \|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fix conflict in changelog from previous release	Neil Johnson	2018-05-01	6	-7/+68
\| \|\\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	changelog for 0.28.1 v0.28.1	Matthew Hodgson	2018-05-01	1	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3160 from krombel/fix_3076	Richard van der Hoff	2018-04-30	1	-1/+14
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add guard for None on purge_history api
\| * \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \|