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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove Unused ref to hs	Luke Barnard	2017-04-12	1	-1/+0
\|
*	Move a space	Luke Barnard	2017-04-12	1	-2/+2
\|
*	Only notify user, not entire room	Luke Barnard	2017-04-12	1	-3/+1
\|
*	Remove comment, simplify null-guard	Luke Barnard	2017-04-12	1	-4/+1
\|
*	Handle no previous RM	Luke Barnard	2017-04-12	1	-1/+4
\|
*	travis flake8..	Luke Barnard	2017-04-11	1	-0/+1
\|
*	flake8	Luke Barnard	2017-04-11	1	-1/+0
\|
*	Refactor event ordering check to events store	Luke Barnard	2017-04-11	2	-28/+32
\|
*	Copyright	Luke Barnard	2017-04-11	1	-1/+1
\|
*	flake8	Luke Barnard	2017-04-11	3	-5/+4
\|
*	Finish implementing RM endpoint	Luke Barnard	2017-04-11	5	-48/+67
\| \| \| \| \|	- This change causes a 405 to be sent if "m.read_marker" is set via /account_data - This also fixes-up the RM endpoint so that it actually Works.
*	Initial commit of RM server-side impl	lukebarnard	2017-04-11	2	-0/+153
\| \| \| \|	(See https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit#heading=h.lndohpg8at5u)
*	trust a hypothetical future riot.im IS	Matthew Hodgson	2017-04-10	1	-0/+1
\|
*	Typo	Erik Johnston	2017-04-10	1	-1/+1
\|
*	Merge pull request #2102 from DanielDent/add-auth-email	David Baker	2017-04-10	2	-1/+21
\|\ \| \| \| \|	Support authenticated SMTP
\| *	Support authenticated SMTP	Daniel Dent	2017-04-05	2	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \|	Closes (SYN-714) #1385 Signed-off-by: Daniel Dent <matrixcontrib@contactdaniel.net>
* \|	Merge pull request #2109 from matrix-org/erikj/send_queue_fix	Erik Johnston	2017-04-10	3	-92/+245
\|\ \ \| \| \| \| \| \|	Fix up federation SendQueue and document types
\| * \|	Rename variable	Erik Johnston	2017-04-10	1	-7/+7
\| \| \|
\| * \|	Revert to sending the same data type as before	Erik Johnston	2017-04-10	1	-2/+2
\| \| \|
\| * \|	Change name	Erik Johnston	2017-04-10	1	-2/+2
\| \| \|
\| * \|	Comments	Erik Johnston	2017-04-10	2	-6/+8
\| \| \|
\| * \|	Comment	Erik Johnston	2017-04-07	1	-2/+15
\| \| \|
\| * \|	Add logging	Erik Johnston	2017-04-07	1	-0/+8
\| \| \|
\| * \|	Fix up federation SendQueue and document types	Erik Johnston	2017-04-07	2	-91/+221
\| \| \|
* \| \|	Up replication ping timeout	Erik Johnston	2017-04-10	1	-2/+4
\| \| \|
* \| \|	Merge pull request #2108 from matrix-org/erikj/current_state_ids	Erik Johnston	2017-04-07	1	-10/+26
\|\ \ \ \| \|/ / \|/\| \|	Speed up get_current_state_ids
\| * \|	Comment	Erik Johnston	2017-04-07	1	-0/+9
\| \| \|
\| * \|	Speed up get_current_state_ids	Erik Johnston	2017-04-07	1	-10/+17
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using _simple_select_list is fairly expensive for functions that return a lot of rows and/or get called a lot. (This is because it carefully constructs a list of dicts). get_current_state_ids gets called a lot on startup and e.g. when the IRC bridge decided to send tonnes of joins/leaves (as it invalidates the cache). We therefore replace it with a custon txn function that builds up the final result dict without building up and intermediate representation.
* \|	Merge pull request #2107 from HarHarLinks/patch-1	Erik Johnston	2017-04-07	1	-1/+1
\|\ \ \| \| \| \| \| \|	fix typo in synctl help
\| * \|	fix typo in synctl help	Kim Brose	2017-04-06	1	-1/+1
\| \| \|
* \| \|	Merge pull request #2103 from matrix-org/erikj/no-double-encode	Erik Johnston	2017-04-07	5	-47/+88
\|\ \ \ \| \| \| \| \| \| \| \|	Don't double encode replication data
\| * \| \|	Document types of the replication streams	Erik Johnston	2017-04-06	1	-28/+76
\| \| \| \|
\| * \| \|	Don't double json encode typing replication data	Erik Johnston	2017-04-05	2	-6/+2
\| \| \| \|
\| * \| \|	Don't double json encode federation replication data	Erik Johnston	2017-04-05	2	-13/+10
\| \| \| \|
* \| \| \|	Use iteritems	Erik Johnston	2017-04-06	1	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #2106 from matrix-org/erikj/reduce_user_sync	Erik Johnston	2017-04-06	1	-4/+43
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Reduce rate of USER_SYNC repl commands
\| * \| \| \|	Comment	Erik Johnston	2017-04-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Docs	Erik Johnston	2017-04-06	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	Don't immediately notify the master about users whose syncs have gone away	Erik Johnston	2017-04-05	1	-4/+36
\| \|/ / /
* \| \| \|	Fix incorrect type when using InvalidateCacheCommand	Erik Johnston	2017-04-06	1	-1/+1
\| \| \| \|
* \| \| \|	Add log lines	Erik Johnston	2017-04-05	1	-1/+2
\| \| \| \|
* \| \| \|	Merge pull request #2104 from matrix-org/erikj/metrics_tcp	Erik Johnston	2017-04-05	1	-7/+38
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Rearrange TCP replication metrics
\| * \| \|	Rearrange metrics	Erik Johnston	2017-04-05	2	-19/+31
\| \| \| \|
\| * \| \|	Fix typo	Erik Johnston	2017-04-05	1	-2/+2
\| \| \| \|
\| * \| \|	Fixup some metrics for tcp repl	Erik Johnston	2017-04-05	2	-0/+19
\|/ / /
* \| \|	Merge pull request #2097 from matrix-org/erikj/repl_tcp_client	Erik Johnston	2017-04-05	21	-582/+602
\|\ \ \ \| \| \| \| \| \| \| \|	Move to using TCP replication
\| * \| \|	Add comment	Erik Johnston	2017-04-04	1	-0/+5
\| \| \| \|
\| * \| \|	Add the appropriate amount of preserve_fn	Erik Johnston	2017-04-04	4	-17/+19
\| \| \| \|
\| * \| \|	Remove unused worker config option	Erik Johnston	2017-04-04	1	-1/+0
\| \| \| \|
\| * \| \|	Shuffle and comment synchrotron presence	Erik Johnston	2017-04-04	1	-9/+11
\| \| \| \|
\| * \| \|	Move where we ack federation	Erik Johnston	2017-04-04	1	-7/+16
\| \| \| \|
\| * \| \|	Update all the workers and master to use TCP replication	Erik Johnston	2017-04-03	9	-401/+259
\| \| \| \|
\| * \| \|	Change slave storage to use new replication interface	Erik Johnston	2017-04-03	11	-179/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As the TCP replication uses a slightly different API and streams than the HTTP replication. This breaks HTTP replication.
\| * \| \|	Add basic replication client handler and factory	Erik Johnston	2017-04-03	1	-0/+196
\| \| \| \|
* \| \| \|	Merge pull request #2099 from matrix-org/erikj/deviceinbox_reduce	Erik Johnston	2017-04-05	1	-4/+7
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Deduplicate new deviceinbox rows for replication
\| * \| \|	Deduplicate new deviceinbox rows for replication	Erik Johnston	2017-04-04	1	-4/+7
\|/ / /
* \| \|	Merge pull request #2098 from matrix-org/erikj/repl_tcp_fix	Erik Johnston	2017-04-04	3	-6/+15
\|\ \ \ \| \| \| \| \| \| \| \|	Advance replication streams even if nothing is listening
\| * \| \|	Advance replication streams even if nothing is listening	Erik Johnston	2017-04-04	3	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise the streams don't advance and steadily fall behind, so when a worker does connect either a) they'll be streamed lots of old updates or b) the connection will fail as the streams are too far behind.
* \| \| \|	Fiddle tcp replication logging	Erik Johnston	2017-04-04	1	-2/+2
\|/ / /
* \| \|	Merge pull request #2082 from matrix-org/erikj/repl_tcp_server	Erik Johnston	2017-04-04	15	-20/+2156
\|\ \ \ \| \| \| \| \| \| \| \|	Replace HTTP replication with TCP replication (Server side part)
\| * \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2017-04-04	28	-180/+489
\| \|\ \ \ \| \|/ / / \|/\| / / \| \|/ /	erikj/repl_tcp_server
* \| \|	Merge pull request #2095 from matrix-org/rav/cull_log_preserves	Richard van der Hoff	2017-04-03	4	-43/+31
\|\ \ \ \| \| \| \| \| \| \| \|	Cull spurious PreserveLoggingContexts
\| * \| \|	Remove spurious yield	Richard van der Hoff	2017-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In `MessageHandler`, remove `yield` on call to `Notifier.on_new_room_event`: it doesn't return anything anyway.
\| * \| \|	Remove more spurious `PreserveLoggingContext`s	Richard van der Hoff	2017-04-03	1	-24/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `PreserveLoggingContext` around calls to `Notifier.on_new_room_event`; there is no problem if the logcontext is set when calling it.
\| * \| \|	Remove spurious PreserveLoggingContext	Richard van der Hoff	2017-04-03	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In `on_new_room_event`, remove `PreserveLoggingContext` - we can call its subroutines with the logcontext set.
\| * \| \|	preserve_fn some deferred-returning things	Richard van der Hoff	2017-04-03	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In `Notifier._on_new_room_event`, `preserve_fn` around its subroutines which return deferreds, so that it is safe to call it with an active logcontext.
\| * \| \|	Fix fixme in preserve_fn	Richard van der Hoff	2017-04-03	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`preserve_fn` is no longer used as a decorator anywhere, so we can safely fix a fixme therein.
\| * \| \|	Remove spurious @preserve_fn decorators	Richard van der Hoff	2017-04-03	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `@preserve_fn` decorators on `on_new_room_event`, `_notify_pending_new_room_events`, `_on_new_room_event`, `on_new_event`, and `on_new_replication_data` - none of these functions return a deferred, and the decorator does nothing unless the wrapped function returns a deferred, so the decorator was a no-op.
* \| \| \|	Merge remote-tracking branch 'origin/release-v0.20.0' into develop	Richard van der Hoff	2017-04-03	2	-5/+19
\|\ \ \ \
\| * \ \ \	Merge pull request #2094 from matrix-org/rav/fix_federation_join	Richard van der Hoff	2017-04-03	2	-5/+19
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Accept join events from all servers
\| \| * \| \| \|	Accept join events from all servers	Richard van der Hoff	2017-04-03	2	-5/+19
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that we accept join events from any server, rather than just the origin server, to make the federation join dance work correctly. (Fixes #1893).
* \| / / /	Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-04-03	2	-1/+45
\|\\| \| \| \| \| \|/ / / \|/\| \| \|
\| * \| \|	Bump version and changelog v0.20.0-rc1	Erik Johnston	2017-03-30	2	-1/+45
\| \| \| \|
* \| \| \|	Merge pull request #2078 from APwhitehat/assertuserfriendly	Erik Johnston	2017-03-31	1	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	add user friendly report of assertion error in synctl.py
\| * \| \| \|	add user friendly report of assertion error in synctl.py	Anant Prakash	2017-03-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Anant Prakash <anantprakashjsr@gmail.com>
* \| \| \| \|	Merge pull request #1984 from RyanBreaker/patch-1	Erik Johnston	2017-03-31	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add missing package to CentOS section
\| * \| \| \| \|	Add --upgrade pip	Ryan Breaker	2017-03-13	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Needed before `pip instal --upgrade setuptools` for CentOS 7 and also doesn't hurt for any other distro.
\| * \| \| \| \|	Add missing package to CentOS section	Ryan Breaker	2017-03-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also added Fedora 25 to header as the same packages work for it as well.
* \| \| \| \| \|	Merge pull request #2011 from matrix-org/matthew/turn_allow_guests	Erik Johnston	2017-03-31	3	-5/+46
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add setting (on by default) to support TURN for guests
\| * \| \| \| \| \|	typo	Matthew Hodgson	2017-03-15	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	set default for turn_allow_guests correctly	Matthew Hodgson	2017-03-15	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add setting (on by default) to support TURN for guests	Matthew Hodgson	2017-03-15	3	-5/+46
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1986 from matrix-org/matthew/enable_guest_3p	Erik Johnston	2017-03-31	1	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	enable guest access for the 3pl/3pid APIs
\| * \| \| \| \| \| \|	switch to allow_guest=True for authing 3Ps as per PR feedback	Matthew Hodgson	2017-03-31	1	-0/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	enable guest access for the 3pl/3pid APIs	Matthew Hodgson	2017-03-12	1	-8/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2024 from jerrykan/db_port_schema	Erik Johnston	2017-03-31	1	-3/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't assume postgres tables are in the public schema during db port
\| * \| \| \| \| \| \| \|	Don't assume postgres tables are in the public schema during db port	John Kristensen	2017-03-17	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When fetching the list of tables from the postgres database during the db port, it is assumed that the tables are in the public schema. This is not always the case, so lets just rely on postgres to determine the default schema to use.
* \| \| \| \| \| \| \| \|	Merge pull request #1961 from benhylau/patch-1	Erik Johnston	2017-03-31	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify doc for SQLite to PostgreSQL port
\| * \| \| \| \| \| \| \| \|	Clarify doc for SQLite to PostgreSQL port	Benedict Lau	2017-03-01	1	-3/+3
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1927 from zuckschwerdt/fix-nuke-script	Erik Johnston	2017-03-31	1	-10/+33
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bring nuke-room script to current schema
\| * \| \| \| \| \| \| \| \|	bring nuke-room script to current schema	Christian W. Zuckschwerdt	2017-02-19	1	-10/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Christian W. Zuckschwerdt <christian@zuckschwerdt.org>
* \| \| \| \| \| \| \| \| \|	Merge pull request #2075 from matrix-org/erikj/cache_speed	Erik Johnston	2017-03-31	7	-16/+87
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up cached function access
\| * \| \| \| \| \| \| \| \| \|	Remove unused instance variable	Erik Johnston	2017-03-31	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Docs	Erik Johnston	2017-03-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Revert log context change	Erik Johnston	2017-03-30	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Doc new instance variables	Erik Johnston	2017-03-30	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix up tests	Erik Johnston	2017-03-30	3	-2/+42
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Manually calculate cache key as getcallargs is expensive	Erik Johnston	2017-03-30	1	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is because getcallargs recomputes the getargspec, amongst other things, which we don't need to do as its already been done
\| * \| \| \| \| \| \| \| \| \|	Don't convert to deferreds when not necessary	Erik Johnston	2017-03-30	5	-8/+12
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2076 from matrix-org/erikj/as_perf	Erik Johnston	2017-03-31	2	-19/+23
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make AS's faster
\| * \| \| \| \| \| \| \| \| \| \|	Add comment	Erik Johnston	2017-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Cache whether an AS is interested based on members	Erik Johnston	2017-03-28	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove param and cast at call site	Erik Johnston	2017-03-28	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Compile the regex's used in ASes	Erik Johnston	2017-03-28	2	-10/+8
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2083 from matrix-org/erikj/copy_replace_speed	Erik Johnston	2017-03-31	1	-3/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Speed up copy_and_replace
\| * \| \| \| \| \| \| \| \| \| \|	Speed up copy_and_replace	Erik Johnston	2017-03-30	1	-3/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2079 from matrix-org/erikj/push_regex_cache	Erik Johnston	2017-03-30	1	-47/+57
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Cache glob to regex at a higher level for push
\| * \| \| \| \| \| \| \| \| \|	Cache glob to regex at a higher level for push	Erik Johnston	2017-03-29	1	-47/+57
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix the logcontext handling in the cache wrappers (#2077)	Richard van der Hoff	2017-03-30	4	-19/+136
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The cache wrappers had a habit of leaking the logcontext into the reactor while the lookup function was running, and then not restoring it correctly when the lookup function had completed. It's all the fault of `preserve_context_over_{fn,deferred}` which are basically a bit broken.
\| \| \| \| \| \| \| \| \| * \|	Always advance stream tokens	Erik Johnston	2017-04-03	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Use callbacks to notify tcp replication rather than deferreds	Erik Johnston	2017-03-31	2	-20/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Add a timestamp to USER_SYNC command	Erik Johnston	2017-03-31	4	-16/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This timestamp is used to indicate when the user last sync'd
\| \| \| \| \| \| \| \| \| * \|	Fix up presence	Erik Johnston	2017-03-31	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Add a brief list of commands to docs	Erik Johnston	2017-03-31	1	-0/+46
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Fix up docs	Erik Johnston	2017-03-31	4	-28/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Remove user from process_presence when stops syncing	Erik Johnston	2017-03-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Fix indentation in docs/	Erik Johnston	2017-03-30	1	-25/+28
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Add tcp replication listener type and hook it up	Erik Johnston	2017-03-30	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Add functions to presence to support remote syncs	Erik Johnston	2017-03-30	1	-0/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The TCP replication protocol streams deltas of who has started or stopped syncing. This is different from the HTTP API which periodically sends the full list of users who are syncing. This commit adds support for the new TCP style of sending deltas.
\| \| \| \| \| \| \| \| \| * \|	Add server side resource for tcp replication	Erik Johnston	2017-03-30	1	-0/+300
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Initial TCP protocol implementation	Erik Johnston	2017-03-30	4	-0/+1148
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This defines the low level TCP replication protocol
\| \| \| \| \| \| \| \| \| * \|	Define the various streams we will replicate	Erik Johnston	2017-03-30	2	-0/+423
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Make federation send queue take the current position	Erik Johnston	2017-03-30	2	-16/+26
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Add a simple hook to wait for replication traffic	Erik Johnston	2017-03-30	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Add new storage functions for new replication	Erik Johnston	2017-03-30	5	-4/+137
\| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new replication protocol will keep all the streams separate, rather than muxing multiple streams into one.
* \| \| \| \| \| \| \| \| \|	Use txn.fetchall() so we can reuse txn	Erik Johnston	2017-03-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	synctl.py: wait for synapse to stop before restarting (#2020)	Anant Prakash	2017-03-29	1	-4/+43
\|/ / / / / / / / /
* \| \| \| \| \| \| / /	Increase cache size for _get_state_group_for_event	Erik Johnston	2017-03-29	1	-1/+1
\| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1849 from matrix-org/erikj/state_typo	Erik Johnston	2017-03-29	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where current_state_events renamed to current_state_ids
\| * \| \| \| \| \| \| \|	Fix bug where current_state_events renamed to current_state_ids	Erik Johnston	2017-01-23	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Bail early if remote wouldn't be retried (#2064)	Erik Johnston	2017-03-29	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Bail early if remote wouldn't be retried * Don't always return true * Just use get_retry_limiter * Spelling
* \| \| \| \| \| \| \| \|	Merge pull request #2053 from matrix-org/erikj/e2e_one_time_upsert	Erik Johnston	2017-03-29	1	-9/+50
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't user upsert to persist new one time keys
\| * \| \| \| \| \| \| \| \|	Decrank last commit	Erik Johnston	2017-03-29	1	-4/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2017-03-29	45	-593/+828
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/e2e_one_time_upsert
\| * \| \| \| \| \| \| \| \| \|	Correctly look up key	Erik Johnston	2017-03-29	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	The algorithm is part of the key id	Erik Johnston	2017-03-28	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Raise a more helpful exception	Erik Johnston	2017-03-23	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't user upsert to persist new one time keys	Erik Johnston	2017-03-23	1	-9/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead we no-op duplicate one time key uploads, an error if the key_id already exists but encodes a different key.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2067 from matrix-org/erikj/notify_on_fed	Erik Johnston	2017-03-29	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Notify on new federation traffic
\| * \| \| \| \| \| \| \| \| \|	Notify on new federation traffic	Erik Johnston	2017-03-27	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2037 from ricco386/fix_readme_centos_issues	Richard van der Hoff	2017-03-29	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix installation issues
\| * \| \| \| \| \| \| \| \| \| \|	Removed requirement that is not needed	Richard Kellner	2017-03-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I have removed libsodium from CentOS system requirements, as it is part PyNaCl. Signed-off-by: Richard Kellner <richard.kellner@gmail.com>
\| * \| \| \| \| \| \| \| \| \| \|	Updated user creation section	Richard Kellner	2017-03-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	register_new_matrix_user command has one more question, I have updated the documentation to match the reality.
\| * \| \| \| \| \| \| \| \| \| \|	Added missing system requiremnt and pip upgrade before install	Richard Kellner	2017-03-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When installing on CentOS7 I wans't able to follow README instructions to install due to errors. I was missing libsodium in order to compile python dependencies. Default version of Python pip is really old and therefore setuptools upgrade ended with error as well. In order to be able to continue I needed to upgrade pip as well.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2063 from matrix-org/erikj/device_list_batch	Erik Johnston	2017-03-28	2	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Batch sending of device list pokes
\| * \| \| \| \| \| \| \| \| \| \|	Batch sending of device list pokes	Erik Johnston	2017-03-24	2	-0/+5
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2070 from matrix-org/erikj/perf_send	Erik Johnston	2017-03-27	1	-36/+51
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Short circuit if all new events have same state group
\| * \| \| \| \| \| \| \| \| \|	Typo	Erik Johnston	2017-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Short circuit if all new events have same state group	Erik Johnston	2017-03-27	1	-36/+51
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2062 from matrix-org/erikj/presence_replication	Erik Johnston	2017-03-24	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use presence replication stream to invalidate cache
\| * \| \| \| \| \| \| \| \| \|	Actually call invalidate	Erik Johnston	2017-03-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use presence replication stream to invalidate cache	Erik Johnston	2017-03-24	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of using the cache invalidation replication stream to invalidate the _get_presence_cache, we can instead rely on the presence replication stream. This reduces the amount of replication traffic considerably.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2061 from matrix-org/erikj/add_transaction_store	Erik Johnston	2017-03-24	2	-0/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add slave transaction store to workers who send federation requests
\| * \| \| \| \| \| \| \| \| \|	Add slave transaction store	Erik Johnston	2017-03-24	2	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2060 from matrix-org/erikj/cache_hosts_in_room	Erik Johnston	2017-03-24	2	-2/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache hosts in room
\| * \| \| \| \| \| \| \| \| \| \|	Cache hosts in room	Erik Johnston	2017-03-24	2	-2/+11
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2058 from matrix-org/rav/logcontext_leaks_2	Richard van der Hoff	2017-03-24	1	-12/+16
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	try not to drop context after federation requests
\| * \| \| \| \| \| \| \| \| \| \|	try not to drop context after federation requests	Richard van der Hoff	2017-03-23	1	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	preserve_context_over_fn uses a ContextPreservingDeferred, which only restores context for the duration of its callbacks, which isn't really correct, and means that subsequent operations in the same request can end up without their logcontexts.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2057 from matrix-org/rav/missing_yield_2	Richard van der Hoff	2017-03-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Add another missing yield on check_device_registered
\| * \| \| \| \| \| \| \| \| \| \|	Add another missing yield on check_device_registered	Richard van der Hoff	2017-03-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2054 from matrix-org/erikj/user_iter_cursor	Erik Johnston	2017-03-24	18	-131/+101
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce some CPU work on DB threads
\| * \| \| \| \| \| \| \| \| \| \| \|	Replace some calls to cursor_to_dict	Erik Johnston	2017-03-24	3	-39/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cursor_to_dict can be surprisinglh expensive for large result sets, so lets only call it when we need to.
\| * \| \| \| \| \| \| \| \| \| \| \|	Use iter(items\|values)	Erik Johnston	2017-03-24	3	-51/+48
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	User Cursor.__iter__ instead of fetchall	Erik Johnston	2017-03-23	16	-41/+40
\| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents unnecessary construction of lists
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2055 from matrix-org/dbkr/fix_add_msisdn_requestToken	David Baker	2017-03-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix token request for addition of phone numbers
\| * \| \| \| \| \| \| \| \| \| \| \|	Oops, remove unintentional change	David Baker	2017-03-23	1	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix token request for addition of phone numbers	David Baker	2017-03-23	2	-1/+8
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2056 from matrix-org/dbkr/fix_invite_reject	David Baker	2017-03-24	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix rejection of invites not reaching sync
\| * \| \| \| \| \| \| \| \| \| \|	Fix rejection of invites not reaching sync	David Baker	2017-03-23	1	-0/+7
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always allow the user to see their own leave events, otherwise they won't see the event if they reject an invite for a room whose history visibility is set such that they cannot see events before joining.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2050 from matrix-org/rav/federation_backoff	Richard van der Hoff	2017-03-23	12	-315/+355
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	push federation retry limiter down to matrixfederationclient
\| * \| \| \| \| \| \| \| \| \| \|	fix tests	Richard van der Hoff	2017-03-23	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Ignore backoff history for invites, aliases, and roomdirs	Richard van der Hoff	2017-03-23	6	-14/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a param to the federation client which lets us ignore historical backoff data for federation queries, and set it for a handful of operations.
\| * \| \| \| \| \| \| \| \| \| \|	push federation retry limiter down to matrixfederationclient	Richard van der Hoff	2017-03-23	8	-287/+280
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than having to instrument everywhere we make a federation call, make the MatrixFederationHttpClient manage the retry limiter.
\| * \| \| \| \| \| \| \| \| \| \|	MatrixFederationHttpClient: clean up	Richard van der Hoff	2017-03-23	1	-17/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rename _create_request to _request, and push ascii-encoding of `destination` and `path` down into it
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2052 from matrix-org/rav/time_bound_deferred	Richard van der Hoff	2017-03-23	2	-4/+39
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix time_bound_deferred to throw the right exception
\| * \| \| \| \| \| \| \| \| \| \|	Fix time_bound_deferred to throw the right exception	Richard van der Hoff	2017-03-23	2	-4/+39
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a failure to instantiate DeferredTimedOutError, time_bound_deferred would throw a CancelledError when the deferred timed out, which was rather confusing.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1783 from pik/filter-validation	Erik Johnston	2017-03-23	4	-95/+238
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	JSONSchema Validation For Filters
\| * \| \| \| \| \| \| \| \| \|	Add jsonschema to python_dependencies.py	pik	2017-03-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: pik <alexander.maznev@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	use jsonschema.FormatChecker for RoomID and UserID strings	pik	2017-03-23	3	-24/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* use a valid filter in rest/client/v2_alpha test Signed-off-by: pik <alexander.maznev@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Add valid filter tests, flake8, fix typo	pik	2017-03-23	2	-10/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: pik <alexander.maznev@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	check_valid_filter using JSONSchema	pik	2017-03-23	2	-94/+175
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add invalid filter tests Signed-off-by: pik <alexander.maznev@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge pull request #2005 from kfatehi/docs/readme	Richard van der Hoff	2017-03-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README: specify python2.7 in virtualenv
\| * \| \| \| \| \| \| \| \| \|	Update README: specify python2.7 in virtualenv	Keyvan Fatehi	2017-03-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2048 from matrix-org/rav/missing_yield	Richard van der Hoff	2017-03-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a missing yield in device key upload
\| * \| \| \| \| \| \| \| \| \| \|	Add a missing yield in device key upload	Richard van der Hoff	2017-03-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(this would only very very rarely actually be a useful thing, so the main problem was the logcontext leak...)
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2049 from matrix-org/rav/logcontext_leaks	Richard van der Hoff	2017-03-23	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix a couple of logcontext leaks
\| * \| \| \| \| \| \| \| \| \| \|	Fix a couple of logcontext leaks	Richard van der Hoff	2017-03-23	2	-5/+5
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use preserve_fn to correctly manage the logcontexts around things we don't want to yield on.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2044 from matrix-org/rav/crypto_docs	Richard van der Hoff	2017-03-22	2	-4/+24
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix up some key verif docstrings
\| * \| \| \| \| \| \| \| \| \| \|	fix up some key verif docstrings	Richard van der Hoff	2017-03-21	2	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2042 from matrix-org/rav/fix_key_caching	Richard van der Hoff	2017-03-22	4	-63/+225
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix caching of remote servers' signature keys
\| * \| \| \| \| \| \| \| \| \| \|	Fix caching of remote servers' signature keys	Richard van der Hoff	2017-03-22	4	-63/+225
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `@cached` decorator on `KeyStore._get_server_verify_key` was missing its `num_args` parameter, which meant that it was returning the wrong key for any server which had more than one recorded key. By way of a fix, change the default for `num_args` to be all arguments. To implement that, factor out a common base class for `CacheDescriptor` and `CacheListDescriptor`.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Matthew Hodgson	2017-03-21	3	-4/+51
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'release-v0.19.3' of github.com:matrix-org/synapse v0.19.3	Erik Johnston	2017-03-20	50	-238/+1531
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Bump changelog and version github/release-v0.19.3 release-v0.19.3	Erik Johnston	2017-03-20	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Bump changelog and versions v0.19.3-rc2	Erik Johnston	2017-03-13	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3	Erik Johnston	2017-03-13	48	-237/+1483
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge tag 'v0.19.3-rc1' into release-v0.19.3	Erik Johnston	2017-03-13	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes in synapse v0.19.3-rc1 (2017-03-08) =========================================== Features: * Add some administration functionalities. Thanks to morteza-araby! (PR #1784) Changes: * Reduce database table sizes (PR #1873, #1916, #1923, #1963) * Update contrib/ to not use syutil. Thanks to andrewshadura! (PR #1907) * Don't fetch current state when sending an event in common case (PR #1955) Bug fixes: * Fix synapse_port_db failure. Thanks to Pneumaticat! (PR #1904) * Fix caching to not cache error responses (PR #1913) * Fix APIs to make kick & ban reasons work (PR #1917) * Fix bugs in the /keys/changes api (PR #1921) * Fix bug where users couldn't forget rooms they were banned from (PR #1922) * Fix issue with long language values in pushers API (PR #1925) * Fix a race in transaction queue (PR #1930) * Fix dynamic thumbnailing to preserve aspect ratio. Thanks to jkolo! (PR #1945) * Fix device list update to not constantly resync (PR #1964) * Fix potential for huge memory usage when getting device that have changed (PR #1969)
\| \| \| * \| \| \| \| \| \| \| \| \|	Bump changelog and version v0.19.3-rc1	Erik Johnston	2017-03-08	2	-1/+33
\| \| \| \| \|_\|_\|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| * / \| \| \| \| \| \| \| \|	Bump changelog and version	Erik Johnston	2017-03-08	2	-1/+33
\| \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #2028 from majewsky/readme-fix-1	Matthew Hodgson	2017-03-18	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	README.md: fix link to client list on matrix.org/docs
\| \| * \| \| \| \| \| \| \| \|	README.md: fix link to client list on matrix.org/docs	Stefan Majewsky	2017-03-18	1	-3/+3
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2033 from matrix-org/erikj/repl_speed	Erik Johnston	2017-03-21	5	-54/+39
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't send the full event json over replication
\| * \| \| \| \| \| \| \| \| \|	Fix unit test	Erik Johnston	2017-03-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	PEP8	Erik Johnston	2017-03-20	2	-3/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't send the full event json over replication	Erik Johnston	2017-03-17	4	-50/+38
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2035 from matrix-org/rav/debug_federation	Richard van der Hoff	2017-03-21	1	-1/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Add some debug to help diagnose weird federation issue
\| * \| \| \| \| \| \| \| \| \|	Add some debug to help diagnose weird federation issue	Richard van der Hoff	2017-03-20	1	-1/+8
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2026 from matrix-org/rav/logcontext_docs	Richard van der Hoff	2017-03-20	2	-8/+449
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logcontext docs
\| * \| \| \| \| \| \| \| \| \|	log_contexts.rst: fix formatting of Note block	Richard van der Hoff	2017-03-20	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apparently the github RST renderer doesn't like Note blocks.
\| * \| \| \| \| \| \| \| \| \|	log_contexts.rst: fix typos	Richard van der Hoff	2017-03-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Logcontext docs	Richard van der Hoff	2017-03-17	2	-8/+449
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2027 from matrix-org/rav/logcontext_leaks	Richard van der Hoff	2017-03-20	12	-62/+147
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A few fixes to logcontext things
\| * \| \| \| \| \| \| \| \| \|	Stop preserve_fn leaking context into the reactor	Richard van der Hoff	2017-03-18	3	-34/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a bug in ``logcontext.preserve_fn`` which made it leak context into the reactor, and add a test for it. Also, get rid of ``logcontext.reset_context_after_deferred``, which tried to do the same thing but had its own, different, set of bugs.
\| * \| \| \| \| \| \| \| \| \|	Run the reactor with the sentinel logcontext	Richard van der Hoff	2017-03-18	8	-16/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a class of 'Unexpected logcontext' messages, which were happening because the logcontext was somewhat arbitrarily swapping between the sentinel and the `run` logcontext.
\| * \| \| \| \| \| \| \| \| \|	Remove broken use of clock.call_later	Richard van der Hoff	2017-03-18	1	-12/+3
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	background_updates was using `call_later` in a way that leaked the logcontext into the reactor. We could have rewritten it to do it properly, but given that we weren't using the fancier facilities provided by `call_later`, we might as well just use `async.sleep`, which does the logcontext stuff properly.
* \| \| \| \| \| \| \| \| \|	Merge pull request #2025 from matrix-org/rav/no_reset_state_on_rejections	Richard van der Hoff	2017-03-20	6	-84/+278
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Avoid resetting state on rejected events
\| * \| \| \| \| \| \| \| \|	Avoid resetting state on rejected events	Richard van der Hoff	2017-03-17	2	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we get a rejected event, give it the same state_group as its prev_event, rather than no state_group at all. This should fix https://github.com/matrix-org/synapse/issues/1935.
\| * \| \| \| \| \| \| \| \|	Refactoring and cleanups	Richard van der Hoff	2017-03-17	5	-80/+264
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A few non-functional changes: * A bunch of docstrings to document types * Split `EventsStore._persist_events_txn` up a bit. Hopefully it's a bit more readable. * Rephrase `EventFederationStore._update_min_depth_for_room_txn` to avoid mind-bending conditional. * Rephrase rejected/outlier conditional in `_update_outliers_txn` to avoid mind-bending conditional.
* \| \| \| \| \| \| \| \|	Merge pull request #2016 from matrix-org/rav/queue_pdus_during_join	Richard van der Hoff	2017-03-17	2	-24/+69
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|	Queue up federation PDUs while a room join is in progress
\| * \| \| \| \| \| \| \|	Queue up federation PDUs while a room join is in progress	Richard van der Hoff	2017-03-15	1	-24/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This just takes the existing `room_queues` logic and moves it out to `on_receive_pdu` instead of `_process_received_pdu`, which ensures that we don't start trying to fetch prev_events and whathaveyou until the join has completed.
\| * \| \| \| \| \| \| \|	Implement reset_context_after_deferred	Richard van der Hoff	2017-03-15	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to correctly reset the context when we fire off a deferred we aren't going to wait for.
* \| \| \| \| \| \| \| \|	Merge pull request #2022 from matrix-org/erikj/no_op_sync	Erik Johnston	2017-03-16	10	-52/+93
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement no op for room stream in sync
\| * \| \| \| \| \| \| \| \|	Comments	Erik Johnston	2017-03-16	2	-2/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Comment	Erik Johnston	2017-03-16	1	-3/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Don't recreate so many sets	Erik Johnston	2017-03-16	10	-51/+42
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Implement no op for room stream in sync	Erik Johnston	2017-03-16	1	-4/+47
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #2014 from Half-Shot/hs/fix-appservice-presence	Erik Johnston	2017-03-15	2	-2/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add fallback to last_active_ts if it beats the last sync time on a presence timeout.
\| * \| \| \| \| \| \| \| \|	Modify test_user_sync so it doesn't look at last_active_ts over ↵	Will Hunt	2017-03-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	last_user_sync_ts
\| * \| \| \| \| \| \| \| \|	Add a great comment to handle_timeout for active vs sync times.	Will Hunt	2017-03-15	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add fallback to last_active_ts if it beats the last sync time.	Will Hunt	2017-03-15	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2013 from matrix-org/erikj/presence_FASTER	Erik Johnston	2017-03-15	7	-53/+115
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Format presence events on the edges instead of reformatting them multiple times
\| * \| \| \| \| \| \| \| \| \|	Comment	Erik Johnston	2017-03-15	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Cache set of users whose presence the other user should see	Erik Johnston	2017-03-15	1	-13/+27
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Comment	Erik Johnston	2017-03-15	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove unused import	Erik Johnston	2017-03-15	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Format presence events on the edges instead of reformatting them multiple times	Erik Johnston	2017-03-15	7	-39/+80
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1997 from matrix-org/dbkr/cas_partialdownload	David Baker	2017-03-15	1	-1/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Handle PartialDownloadError in CAS login
\| * \| \| \| \| \| \| \| \|	Handle PartialDownloadError in CAS login	David Baker	2017-03-14	1	-1/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2010 from matrix-org/rav/fix_txnq_wedge	Richard van der Hoff	2017-03-15	6	-5/+29
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|	Fix assertion to stop transaction queue getting wedged
\| * \| \| \| \| \| \| \| \|	Fix assertion to stop transaction queue getting wedged	Richard van der Hoff	2017-03-15	6	-5/+29
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... and update some docstrings to correctly reflect the types being used. get_new_device_msgs_for_remote can return a long under some circumstances, which was being stored in last_device_list_stream_id_by_dest, and was then upsetting things on the next loop.
* \| \| \| \| \| \| \| \|	Merge pull request #2008 from matrix-org/erikj/notifier_stats	Erik Johnston	2017-03-15	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some metrics on notifier
\| * \| \| \| \| \| \| \| \|	Add some metrics on notifier	Erik Johnston	2017-03-15	1	-0/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2	Erik Johnston	2017-03-15	9	-50/+412
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	Phone number registration / login support v2
\| * \| \| \| \| \| \| \|	Use extend instead of +=	David Baker	2017-03-14	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Oops, remove print	David Baker	2017-03-14	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix registration for broken clients	David Baker	2017-03-13	1	-4/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only offer msisdn flows if the x_show_msisdn option is given.
\| * \| \| \| \| \| \| \|	Support registration / login with phone number	David Baker	2017-03-13	9	-50/+395
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes from https://github.com/matrix-org/synapse/pull/1971
* \| \| \| \| \| \| \| \|	Merge pull request #1992 from matrix-org/rav/fix_media_loop	Richard van der Hoff	2017-03-14	4	-24/+121
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix routing loop when fetching remote media
\| * \| \| \| \| \| \| \| \|	kick jenkins	Richard van der Hoff	2017-03-14	0	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Address review comments	Richard van der Hoff	2017-03-14	2	-20/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- don't blindly proxy all HTTPRequestExceptions - log unexpected exceptions at error - avoid `isinstance` - improve docs on `from_http_response_exception`