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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \| \| \|	Comment	Erik Johnston	2017-07-11	2	-0/+26
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove u/ requirement	Erik Johnston	2017-07-11	1	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Lift out visibility parsing	Erik Johnston	2017-07-11	1	-20/+21
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Comments	Erik Johnston	2017-07-11	4	-43/+132
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Initial group server implementation	Erik Johnston	2017-07-10	11	-11/+1064
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2501 from matrix-org/dbkr/channel_notifications	Erik Johnston	2017-10-11	3	-7/+85
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support for channel notifications
\| * \| \| \| \| \| \| \| \| \|	pep8	David Baker	2017-10-10	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't KeyError if no power_levels event	David Baker	2017-10-10	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use notification levels in power_levels	David Baker	2017-10-10	3	-12/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than making the condition directly require a specific power level. This way the level require to notify a room can be configured per room.
\| * \| \| \| \| \| \| \| \| \|	There was already a constant for this	David Baker	2017-10-10	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also update copyright
\| * \| \| \| \| \| \| \| \| \|	More optimisation	David Baker	2017-10-10	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	What year is it!? Who's the president!?	David Baker	2017-10-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into dbkr/channel_notifications	David Baker	2017-10-10	7	-107/+183
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Make be faster	David Baker	2017-10-05	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add fastpath optimisation	David Baker	2017-10-05	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2017-10-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	They're called rooms	David Baker	2017-10-05	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Get rule type right	David Baker	2017-10-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Support for channel notifications	David Baker	2017-10-05	3	-8/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add condition type to check the sender's power level and add a base rule using it for @channel notifications.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2483 from jeremycline/unfreeze-ujson-dump	Erik Johnston	2017-10-11	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unfreeze event before serializing with ujson
\| * \| \| \| \| \| \| \| \| \| \| \|	Unfreeze event before serializing with ujson	Jeremy Cline	2017-09-30	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In newer versions of https://github.com/esnme/ultrajson, ujson does not serialize frozendicts (introduced in esnme/ultrajson@53f85b1). Although the PyPI version is still 1.35, Fedora ships with a build from commit esnme/ultrajson@2f1d487. This causes the serialization to fail if the distribution-provided package is used. This runs the event through the unfreeze utility before serializing it. Thanks to @ignatenkobrain for tracking down the root cause. fixes #2351 Signed-off-by: Jeremy Cline <jeremy@jcline.org>
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2490 from matrix-org/erikj/drop_left_room_events	Erik Johnston	2017-10-10	3	-0/+65
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Ignore incoming events for rooms that we have left
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix up comment	Erik Johnston	2017-10-09	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Invalidate cache	Erik Johnston	2017-10-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Update comments	Erik Johnston	2017-10-03	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove spurious line feed	Erik Johnston	2017-10-03	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Ignore incoming events for rooms that we have left	Erik Johnston	2017-10-03	2	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When synapse receives an event for a room its not in over federation, it double checks with the remote server to see if it is in fact in the room. This is done so that if the server has forgotten about the room (usually as a result of the database being dropped) it can recover from it. However, in the presence of state resets in large rooms, this can cause a lot of work for servers that have legitimately left. As a hacky solution that supports both cases we drop incoming events for rooms that we have explicitly left. This means that we no longer support the case of servers having forgotten that they've rejoined a room, but that is sufficiently rare that we're not going to support it for now.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2520 from matrix-org/rav/process_incoming_rooms_in_parallel	Richard van der Hoff	2017-10-10	1	-19/+34
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fed server: process PDUs for different rooms in parallel
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fed server: process PDUs for different rooms in parallel	Richard van der Hoff	2017-10-09	1	-19/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With luck, this will give a real-time improvement when there are many rooms and the server ends up calling out to fetch missing events.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2518 from matrix-org/rav/linearize_incoming_transactions	Richard van der Hoff	2017-10-10	1	-1/+29
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Fed server: use a linearizer for ongoing transactions
\| * \| \| \| \| \| \| \| \| \| \| \|	Fed server: use a linearizer for ongoing transactions	Richard van der Hoff	2017-10-09	1	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't want to process the same transaction multiple times concurrently, so use a linearizer.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2517 from matrix-org/rav/fed_server_refactor	Richard van der Hoff	2017-10-09	1	-24/+29
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fed server: refactor on_incoming_transaction
\| * \| \| \| \| \| \| \| \| \| \| \|	fed server: refactor on_incoming_transaction	Richard van der Hoff	2017-10-09	1	-24/+29
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move as much as possible to after the have_responded check, and reduce the number of times we iterate over the pdu list.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2516 from matrix-org/rav/fix_fed_server_origin_check	Richard van der Hoff	2017-10-09	1	-24/+24
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fed server: Move origin-check code to _handle_received_pdu
\| * \| \| \| \| \| \| \| \| \| \|	Fed server: Move origin-check code to _handle_received_pdu	Richard van der Hoff	2017-10-09	1	-24/+24
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The response-building code expects there to be an entry in the `results` list for each entry in the pdu_list, so the early `continue` was messing this up. That doesn't really matter, because all that the federation client does is log any errors, but it's pretty poor form.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2508 from matrix-org/rav/federation_queue_logcontexts	Richard van der Hoff	2017-10-09	1	-16/+32
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix up logcontext handling in (federation) TransactionQueue
\| * \| \| \| \| \| \| \| \| \| \|	Fix up logcontext handling in (federation) TransactionQueue	Richard van der Hoff	2017-10-06	1	-16/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid using preserve_context_over_function, which has problems with respect to logcontexts.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2507 from matrix-org/rav/execute_concurrently_log_contexts	Richard van der Hoff	2017-10-09	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix logcontext handling for concurrently_execute
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix logcontext handling for concurrently_execute	Richard van der Hoff	2017-10-06	1	-2/+2
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid preserve_context_over_deferred, which is broken.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2506 from matrix-org/rav/unhandled_failure	Richard van der Hoff	2017-10-09	1	-24/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix up deferred handling in federation.py
\| * \| \| \| \| \| \| \| \| \| \|	Fix up deferred handling in federation.py	Richard van der Hoff	2017-10-06	1	-24/+21
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Avoid preserve_context_over_deferred, which is broken * set consumeErrors=True on defer.gatherResults, to avoid spurious "unhandled failure" erros
* \| \| \| \| \| \| \| \| \| \|	some comments in the state res code	Richard van der Hoff	2017-10-05	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2502 from matrix-org/dbkr/allow_dms_to_admins	David Baker	2017-10-05	3	-8/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Spam checking: add the invitee to user_may_invite
\| * \| \| \| \| \| \| \| \| \|	Spam checking: add the invitee to user_may_invite	David Baker	2017-10-05	3	-8/+10
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2500 from matrix-org/dbkr/fix_word_boundary_mentions	David Baker	2017-10-05	1	-2/+14
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notif kws that start/end with non-word chars
\| * \| \| \| \| \| \| \| \| \|	Use better method for word boundary searching	David Baker	2017-10-05	1	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From https://github.com/matrix-org/matrix-js-sdk/commit/ebc95667b8a5777d13e5d3c679972bedae022fd5
\| * \| \| \| \| \| \| \| \| \|	pep8	David Baker	2017-10-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix notif kws that start/end with non-word chars	David Baker	2017-10-05	1	-2/+21
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only prepend / append word bounary characters if the search expression starts or ends with a word character, otherwise they don't work because there's no word bounary between whitespace and a non-word char.
* \| \| \| \| \| \| \| \| \|	Merge pull request #2495 from matrix-org/dbkr/spam_check_room_creation	David Baker	2017-10-04	3	-0/+73
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add room creation checks to spam checker
\| * \| \| \| \| \| \| \| \| \|	spam check room publishing	David Baker	2017-10-04	2	-0/+26
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	un-double indent	David Baker	2017-10-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add room creation checks to spam checker	David Baker	2017-10-04	3	-0/+47
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lets the spam checker deny attempts to create rooms and add aliases to them.
* \| \| \| \| \| \| \| \| \|	Merge pull request #2492 from matrix-org/dbkr/spam_check_invites	David Baker	2017-10-03	3	-2/+39
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow spam checker to reject invites too
\| * \| \| \| \| \| \| \| \| \|	s/roomid/room_id/	David Baker	2017-10-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	pass room id too	David Baker	2017-10-03	3	-4/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Federation was passing strings anyway	David Baker	2017-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	so pass string everywhere
\| * \| \| \| \| \| \| \| \| \|	this shouldn't be debug	David Baker	2017-10-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	better logging	David Baker	2017-10-03	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Actually write warpper function	David Baker	2017-10-03	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Skip spam check for admin users	David Baker	2017-10-03	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix param name & lint	David Baker	2017-10-03	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Allow spam checker to reject invites too	David Baker	2017-10-03	2	-6/+18
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #2491 from matrix-org/rav/port_db_fixes	Richard van der Hoff	2017-10-03	1	-4/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Drop search values with nul characters
\| * \| \| \| \| \| \| \| \|	Drop search values with nul characters	Richard van der Hoff	2017-10-02	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/matrix-org/synapse/issues/2187 contains a report of a port failing due to nul characters somewhere in the search table. Let's try dropping the offending rows.
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-10-02	5	-13/+37
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Bump version and changelog v0.23.1	Erik Johnston	2017-10-02	2	-1/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make 'affinity' package optional	Erik Johnston	2017-10-02	2	-2/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move quit_with_error	Erik Johnston	2017-10-02	2	-10/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-10-02	3	-3/+10
\|\\| \| \| \| \| \| \| \| \| \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse v0.23.0	Erik Johnston	2017-10-02	52	-859/+1833
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Bump version and change log github/release-v0.23.0 release-v0.23.0	Erik Johnston	2017-10-02	2	-1/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #2464 from rnbdsh/patch-4	Richard van der Hoff	2017-09-25	1	-2/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove non-existing files, add stop, use synctl
\| \| * \| \| \| \| \| \| \|	Start traditionally, stop synctl	rnbdsh	2017-09-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Starting with synctl lead to "no config file found" Stopping also leads to some (code=exited, status=1/FAILURE), but at least now we can stop the service.
\| \| * \| \| \| \| \| \| \|	Remove non-existing files, add stop, use synctl	rnbdsh	2017-09-24	1	-2/+2
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Non-existing files, when running the suggested from https://github.com/matrix-org/synapse#configuring-synapse /etc/synapse/log_config.yaml so the --log-config leads to an error /etc/sysconfig/synapse The environment-file or even the /etc/sysconfig does not exist in arch linux Also instead of calling python2 we use synctl, as this seems to be the proper way to start it, and it gives us a more useful error in the systemctl status. And we now allow stop (and therefore restart).
* \| \| \| \| \| \| \| \|	Merge pull request #2480 from matrix-org/rav/federation_client_logging	Richard van der Hoff	2017-09-29	1	-7/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve logging of failures in matrixfederationclient
\| * \| \| \| \| \| \| \| \|	Improve logging of failures in matrixfederationclient	Richard van der Hoff	2017-09-28	1	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* don't log exception types twice * not all exceptions have a meaningful 'message'. Use the repr rather than attempting to build a string ourselves.
* \| \| \| \| \| \| \| \| \|	Only log if we've removed media	Erik Johnston	2017-09-28	1	-2/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Handle SERVFAILs when doing AAAA lookups for federation (#2477)	Richard van der Hoff	2017-09-28	1	-5/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... to cope with people with broken dnssec setups, mostly
* \| \| \| \| \| \| \| \|	Up the limits on number of url cache entries to delete at one time	Erik Johnston	2017-09-28	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add old indices	Erik Johnston	2017-09-28	1	-0/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Clear up expired url cache every 10s	Erik Johnston	2017-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Actually assign result to variable	Erik Johnston	2017-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Only pull out local media that were for url cache	Erik Johnston	2017-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix typo in url cache expiry timer	Erik Johnston	2017-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnails	Erik Johnston	2017-09-28	1	-31/+81
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support new and old style media id formats
\| * \| \| \| \| \| \| \| \|	Support new and old style media id formats	Erik Johnston	2017-09-28	1	-31/+81
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix typo	Erik Johnston	2017-09-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #2478 from matrix-org/erikj/expire_url_cache_thumbnails	Erik Johnston	2017-09-28	5	-12/+234
\|\\| \| \| \| \| \| \| \| \| \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	Delete expired url cache data
\| * \| \| \| \| \| \| \|	Change expires column to expires_ts	Erik Johnston	2017-09-28	3	-10/+29
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	More brackets	Erik Johnston	2017-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Delete expired url cache data	Erik Johnston	2017-09-28	5	-5/+208
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #2476 from matrix-org/erikj/joined_members_auth	Erik Johnston	2017-09-28	2	-13/+26
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	Fix /joined_members to work with AS users
\| * \| \| \| \| \| \|	Fix /joined_members to work with AS users	Erik Johnston	2017-09-28	2	-13/+26
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2475 from matrix-org/erikj/joined_members_auth	Erik Johnston	2017-09-27	2	-10/+38
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where /joined_members didn't check user was in room
\| * \| \| \| \| \| \|	Fix bug where /joined_members didn't check user was in room	Erik Johnston	2017-09-27	2	-10/+38
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #2474 from matrix-org/dbkr/spam_check_module	David Baker	2017-09-27	6	-23/+74
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the spam checker a module
\| * \| \| \| \| \| \|	Don't test is spam_checker not None	David Baker	2017-09-27	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes it's a Mock object which is not none but is still not what we're after
\| * \| \| \| \| \| \|	Remove unintentional debugging	David Baker	2017-09-27	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	pep8	David Baker	2017-09-27	2	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Forgot the new file again :(	David Baker	2017-09-27	1	-0/+35
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make the spam checker a module	David Baker	2017-09-26	5	-23/+33
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	pep8	David Baker	2017-09-26	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #2473 from matrix-org/dbkr/factor_out_module_loading	David Baker	2017-09-26	2	-12/+51
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Factor out module loading to a separate place
\| * \| \| \| \| \|	unnecessary parens	David Baker	2017-09-26	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add module_loader.py	David Baker	2017-09-26	1	-0/+41
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Factor out module loading to a separate place	David Baker	2017-09-26	1	-12/+10
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So it can be reused
* \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0 v0.23.0-rc2	Erik Johnston	2017-09-26	3	-19/+39
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge pull request #2470 from matrix-org/erikj/sync_speed_fix	Erik Johnston	2017-09-25	1	-5/+18
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor to speed up incremental syncs
\| \| * \| \| \| \| \|	Refactor to speed up incremental syncs	Erik Johnston	2017-09-25	1	-5/+18
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge pull request #2468 from maxidor/develop	Richard van der Hoff	2017-09-25	1	-13/+20
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify recommended network setup
\| \| * \| \| \| \| \|	Include review feedback	Max Dor	2017-09-25	1	-5/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Clarify recommended network setup	Max Dor	2017-09-25	1	-15/+24
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-09-25	2	-1/+33
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge pull request #2390 from r3dey3/develop	Richard van der Hoff	2017-09-25	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix iteration of requests_missing_keys; list doesn't have .values()
\| \| * \ \ \ \ \ \	Merge branch 'develop' into develop	Richard van der Hoff	2017-09-25	48	-805/+1855
\| \| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix iteration of requests_missing_keys; list doesn't have .values()	Kenny Keslar	2017-07-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kenny Keslar <r3dey3@r3dey3.com>
* \| \| \| \| \| \| \| \|	Bump changelog and version	Erik Johnston	2017-09-26	2	-1/+9
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update CHANGES v0.23.0-rc1	Erik Johnston	2017-09-25	1	-3/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Bump version and changes	Erik Johnston	2017-09-25	2	-1/+25
\|/ / / / / / /
* \| \| \| \| \| \|	Fix logcontxt leak in keyclient (#2465)	Richard van der Hoff	2017-09-25	1	-12/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	preserve_context_over_function doesn't do what you want it to do.
* \| \| \| \| \| \|	Do an AAAA lookup on SRV record targets (#2462)	Richard van der Hoff	2017-09-22	2	-24/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support SRV records which point at AAAA records, as well as A records. Fixes https://github.com/matrix-org/synapse/issues/2405
* \| \| \| \| \| \|	fix thinko'd docstring	Matthew Hodgson	2017-09-22	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix device list when rejoining room (#2461)	Erik Johnston	2017-09-22	1	-2/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2459 from matrix-org/rav/keyring_cleanups	Richard van der Hoff	2017-09-20	5	-214/+353
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up Keyring code
\| * \| \| \| \| \| \|	Fix logcontexts in _check_sigs_and_hashes	Richard van der Hoff	2017-09-20	2	-60/+62
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add some more tests for Keyring	Richard van der Hoff	2017-09-20	1	-37/+140
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix logcontext handling in verify_json_objects_for_server	Richard van der Hoff	2017-09-20	1	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	preserve_context_over_fn is essentially broken, because (a) it pointlessly drops the current logcontext before calling its wrapped function, which means we don't get any useful logcontexts for _handle_key_deferred; (b) it wraps the resulting deferred in a _PreservingContextDeferred, which is very dangerous because you then can't yield on it without leaking context back into the reactor. Instead, let's specify that the resultant deferreds call their callbacks with no logcontext.
\| * \| \| \| \| \| \|	Turn _start_key_lookups into an inlineCallbacks function	Richard van der Hoff	2017-09-20	1	-40/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... which means that logcontexts can be correctly preserved for the stuff it does. get_server_verify_keys is now called with the logcontext, so needs to preserve_fn when it fires off its nested inlineCallbacks function. Also renames get_server_verify_keys to reflect the fact it's meant to be private.
\| * \| \| \| \| \| \|	Fix potential race in _start_key_lookups	Richard van der Hoff	2017-09-20	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the verify_request.deferred has already completed, then `remove_deferreds` will be called immediately. It therefore might resolve the server_to_deferred deferred while there are still other requests for that server in flight. To avoid that, we should build the complete list of requests, and then add the callbacks.
\| * \| \| \| \| \| \|	Add some comments to _start_key_lookups	Richard van der Hoff	2017-09-20	1	-0/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Consistency for how verify_request.deferred is called	Richard van der Hoff	2017-09-20	1	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define that it is run with no log context, and make sure that happens. If we aren't careful to reset the logcontext, we can't bung the deferreds into defer.gatherResults etc. We don't actually do that directly, but we do resolve other deferreds from affected callbacks (notably the server_to_deferred map in _start_key_lookups), and those do get passed into defer.gatherResults. It turns out that this way ends up being least confusing.
\| * \| \| \| \| \| \|	Factor out _start_key_lookups	Richard van der Hoff	2017-09-20	1	-7/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... to make it easier to see what's going on.
\| * \| \| \| \| \| \|	Replace `server_and_json` with `verify_requests`	Richard van der Hoff	2017-09-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a precursor to factoring some of this code out.
\| * \| \| \| \| \| \|	pull out handle_key_deferred to top level	Richard van der Hoff	2017-09-20	1	-43/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's no need for this to be a nested definition; pulling it out not only makes it more efficient, but makes it easier to check that it's not accessing any local variables it shouldn't be.
\| * \| \| \| \| \| \|	Fix incorrect key_ids in error message	Richard van der Hoff	2017-09-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Invalidate signing key cache when we gat an update	Richard van der Hoff	2017-09-20	1	-17/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This might make the cache slightly more efficient.
\| * \| \| \| \| \| \|	Remove redundant `preserve_fn`	Richard van der Hoff	2017-09-20	1	-2/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	preserve_fn is a no-op unless the wrapped function returns a Deferred. verify_json_objects_for_server returns a list, so this is doing nothing.
* \| \| \| \| \| \|	Fix concurrent server_key requests (#2458)	Richard van der Hoff	2017-09-19	2	-4/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a bug where we could end up firing off multiple requests for server_keys for the same server at the same time.
* \| \| \| \| \| \|	Add a config option to block all room invites (#2457)	Richard van der Hoff	2017-09-19	5	-0/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- allows sysadmins the ability to lock down their servers so that people can't send their users room invites.
* \| \| \| \| \| \|	add some comments to on_exchange_third_party_invite_request	Richard van der Hoff	2017-09-19	1	-0/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	PoC for filtering spammy events (#2456)	Richard van der Hoff	2017-09-19	3	-17/+69
\| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Demonstration of how you might add some hooks to filter out spammy events.
* \| \| \| \| \|	Fix overzealous kicking of guest users (#2453)	Richard van der Hoff	2017-09-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should only kick guest users if the guest access event is authorised.
* \| \| \| \| \|	Clean up and document handling of logcontexts in Keyring (#2452)	Richard van der Hoff	2017-09-18	2	-28/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I'm still unclear on what the intended behaviour for `verify_json_objects_for_server` is, but at least I now understand the behaviour of most of the things it calls...
* \| \| \| \| \|	Merge pull request #2451 from matrix-org/erikj/add_state_to_timeline	Erik Johnston	2017-09-18	2	-3/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't filter out current state events from timeline
\| * \| \| \| \| \|	Don't filter out current state events from timeline	Erik Johnston	2017-09-18	2	-3/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2450 from matrix-org/dbkr/push_event_id_only	David Baker	2017-09-18	1	-0/+20
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Add support for event_id_only push format
\| * \| \| \| \| \|	Also include the room_id	David Baker	2017-09-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as really it's part of the event ID
\| * \| \| \| \| \|	Use .get - it's much shorter	David Baker	2017-09-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add support for event_id_only push format	David Baker	2017-09-18	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Param in the data dict of a pusher that tells an HTTP pusher to send just the event_id of the event it's notifying about and the notification counts. For clients that want to go & fetch the body of the event themselves anyway.
* \| \| \| \| \| \|	Merge pull request #2449 from matrix-org/erikj/rejoin_device_lists	Erik Johnston	2017-09-18	1	-13/+12
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Correctly handle leaving room in /key/changes
\| * \| \| \| \| \|	Correctly handle leaving room in /key/changes	Erik Johnston	2017-09-18	1	-13/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2443 from matrix-org/erikj/rejoin_device_lists	Erik Johnston	2017-09-18	4	-29/+153
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send down device list change notif when member leaves/rejoins room
\| * \| \| \| \| \|	Fix typo	Erik Johnston	2017-09-15	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Actually hook leave notifs up	Erik Johnston	2017-09-14	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Handle joining/leaving rooms in /keys/changes	Erik Johnston	2017-09-13	1	-1/+38
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Get left rooms	Erik Johnston	2017-09-13	1	-3/+32
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	In sync handle device lists for newly joined/left rooms	Erik Johnston	2017-09-12	1	-2/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add left section to /keys/changes	Erik Johnston	2017-09-08	3	-11/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Send down device list change notif when member leaves/rejoins room	Erik Johnston	2017-09-07	3	-14/+55
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2439 from matrix-org/rav/tox_tweaks	Richard van der Hoff	2017-09-06	1	-5/+29
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do tox install with pip -e
\| * \| \| \| \| \|	do tox install with pip -e	Richard van der Hoff	2017-09-05	1	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- this ensures we end up with a working virtualenv which we can use for other things.
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2017-09-05	3	-0/+3
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Exclude the github issue template from our sdist (#2440)	Richard van der Hoff	2017-09-05	2	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PR #2413 added an issue template, but just adding files to the project directory upsets the packaging scripts: we need to explicitly include or exclude them. Move the template into a .github directory to make that easy, and to de-clutter the root a bit.
\| * \| \| \| \| \|	Merge pull request #2433 from ptman/patch-1	Erik Johnston	2017-09-01	1	-0/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document known to work postgres version
\| \| * \| \| \| \| \|	Document known to work postgres version	Paul Tötterman	2017-09-01	1	-0/+2
\| \|/ / / / / /
* \| / / / / /	Merge branch 'master' into develop	Richard van der Hoff	2017-09-05	4	-0/+483
\|\\| \| \| \| \| \| \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Set --python when running sytest	Richard van der Hoff	2017-09-01	4	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	.. because I want to make the 'install_and_run' script useful for non-synapse jobs, which do not accept --python. In any case we set up the path here, so sytest shouldn't be guessing it.
\| * \| \| \| \|	Merge pull request #2416 from matrix-org/rav/prometheus_config	Richard van der Hoff	2017-08-22	3	-0/+436
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add prometheus config
\| \| * \| \| \| \|	Add prometheus config	Richard van der Hoff	2017-08-16	3	-0/+436
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... from https://github.com/matrix-org/synapse-prometheus-config.
\| * \| \| \| \| \|	Merge pull request #2413 from matrix-org/toml-issue-template	Tom Lant	2017-08-21	1	-0/+47
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Issue template for Synapse
\| \| * \| \| \| \|	Update ISSUE_TEMPLATE.md	Tom Lant	2017-08-17	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added instructions for checking server version.
\| \| * \| \| \| \|	Update ISSUE_TEMPLATE.md	Tom Lant	2017-08-17	1	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Responding to review comments.
\| \| * \| \| \| \|	Update ISSUE_TEMPLATE.md	Tom Lant	2017-08-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the sentence encouraging people not to file a bug - if people are in doubt we'd rather they filed a bug than gave up entirely.
\| \| * \| \| \| \|	Update ISSUE_TEMPLATE.md	Tom Lant	2017-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Oops capital L.
\| \| * \| \| \| \|	Create ISSUE_TEMPLATE.md	Tom Lant	2017-08-14	1	-0/+36
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \|	A new issue template proposed to try and steer people towards #matrix:matrix.org for support queries relating to running their own homeserver.
* \| \| \| \| \|	fix python path in jenkins scripts	Richard van der Hoff	2017-09-01	4	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Set --python when running sytest	Richard van der Hoff	2017-09-01	4	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	.. because I want to make the 'install_and_run' script useful for non-synapse jobs, which do not accept --python. In any case we set up the path here, so sytest shouldn't be guessing it.
* \| \| \| \| \|	Merge pull request #2428 from matrix-org/rav/update_upgrade	Richard van der Hoff	2017-08-24	1	-33/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tweaks to the upgrade instructions
\| * \| \| \| \| \|	Tweaks to the upgrade instructions	Richard van der Hoff	2017-08-23	1	-33/+42
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2417 from matrix-org/rav/federation_client	Richard van der Hoff	2017-08-23	1	-8/+79
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to the federation test client
\| * \| \| \| \| \|	test federation client: Allow server-name and key-file as options	Richard van der Hoff	2017-08-22	1	-8/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	so that you don't necessarily need a config file.
\| * \| \| \| \| \|	Improvements to the federation test client	Richard van der Hoff	2017-08-17	1	-7/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it read the config file, primarily.
* \| \| \| \| \| \|	Merge pull request #2288 from kyrias/bcrypt	Richard van der Hoff	2017-08-23	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	python_dependencies: Use bcrypt module instead of py-bcrypt
\| * \| \| \| \| \|	python_dependencies: Use bcrypt module instead of py-bcrypt	Johannes Löthberg	2017-06-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	py-bcrypt has been unmaintained for a long while, while bcrypt is actively maintained. And since ff8b87118dcfb153d972e29c2b77b195244d5ddc we're compatible with the bcrypt anyway. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
* \| \| \| \| \| \|	Fix user_dir startup	Richard van der Hoff	2017-08-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing parameter to _base.start_worker_reactor
* \| \| \| \| \| \|	Fix process startup	Richard van der Hoff	2017-08-16	1	-10/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	escape the % that got added in 92168cb so that the process starts up ok.
* \| \| \| \| \| \|	explain why CPU affinity is a good idea	Matthew Hodgson	2017-08-15	1	-0/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2415 from matrix-org/rav/synctl_cpu_affinity	Richard van der Hoff	2017-08-15	14	-465/+271
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow configuration of CPU affinity
\| * \| \| \| \| \| \|	Allow configuration of CPU affinity	Richard van der Hoff	2017-08-15	5	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it possible to set the CPU affinity in the config file, so that we don't need to remember to do it manually every time.
\| * \| \| \| \| \| \|	Factor out common application start	Richard van der Hoff	2017-08-15	11	-464/+248
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have 10 copies of this code, and I don't really want to update each one separately.
* \| \| \| \| \| \|	fix english	hera	2017-08-04	1	-7/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	typo	hera	2017-08-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Reduce spammy log line in synchrotrons	Erik Johnston	2017-08-02	1	-1/+1
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2375 from matrix-org/erikj/port_script	Erik Johnston	2017-07-20	1	-0/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix port script for user directory tables
\| * \| \| \| \| \|	Extend comment	Erik Johnston	2017-07-20	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix port script for user directory tables	Erik Johnston	2017-07-20	1	-0/+18
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2371 from matrix-org/erikj/push_cache_hit	Erik Johnston	2017-07-17	1	-0/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase cache hit ratio for push
\| * \| \| \| \| \|	Increase cache hit ratio for push	Erik Johnston	2017-07-14	1	-0/+8
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't update the cache in all code paths, which causes subsequent calls to miss the cache
* \| \| \| \| \|	Merge pull request #2366 from matrix-org/erikj/push_metrics	Erik Johnston	2017-07-14	1	-2/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more metrics to push rule evaluation
\| * \| \| \| \| \|	Add more metrics to push rule evaluation	Erik Johnston	2017-07-13	1	-2/+42
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2365 from matrix-org/erikj/push_skip_lock	Erik Johnston	2017-07-13	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Push: Don't acquire lock unless necessary
\| * \| \| \| \| \|	Push: Don't acquire lock unless necessary	Erik Johnston	2017-07-13	1	-0/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2362 from matrix-org/erikj/sync_user_users_who_share	Erik Johnston	2017-07-12	1	-8/+7
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Use less DB for device list handling in sync
\| * \| \| \| \|	Use less DB for device list handling in sync	Erik Johnston	2017-07-12	1	-8/+7
\|/ / / / /
* \| \| \| \|	Merge pull request #2354 from krombel/reduce_static_sync_reply	Erik Johnston	2017-07-11	1	-16/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	encode sync-response statically
\| * \| \| \| \|	split out reducing stuff; just make encode_* static	Krombel	2017-07-11	1	-35/+27
\| \| \| \| \| \|
\| * \| \| \| \|	fix test	Krombel	2017-07-10	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	encode sync-response statically; omit empty objects from sync-response	Krombel	2017-07-10	1	-33/+48
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2357 from matrix-org/erikj/push	Erik Johnston	2017-07-11	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't compute push actions for backfilled events
\| * \| \| \| \| \|	Don't compute push actions for backfilled events	Erik Johnston	2017-07-11	1	-1/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* / \| \| \| \|	Reduce log levels in tcp replication	Erik Johnston	2017-07-11	1	-2/+2
\|/ / / / /
* \| \| \| \|	Include registration and as stores in frontend proxy	Erik Johnston	2017-07-07	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-07-07	2	-1/+10
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse v0.22.1	Erik Johnston	2017-07-06	5	-11/+21
\| \|\ \ \ \
\| \| * \| \| \|	Bump version and changelog	Erik Johnston	2017-07-06	2	-1/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2344 from matrix-org/erikj/frontend_proxy	Erik Johnston	2017-07-07	2	-0/+269
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a frontend proxy
\| * \| \| \| \| \|	Add a frontend proxy	Erik Johnston	2017-07-07	2	-0/+269
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2343 from matrix-org/erikj/fastpush	Erik Johnston	2017-07-07	3	-36/+21
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Perf: Don't filter events for push
\| * \| \| \| \|	Perf: Don't filter events for push	Erik Johnston	2017-07-07	3	-36/+21
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We know the users are joined and we can explicitly check for if they are ignoring the user, so lets do that.
* \| \| \| \|	Merge pull request #2342 from matrix-org/erikj/pusher_pool_instantiate	Erik Johnston	2017-07-06	3	-10/+11
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Fix bug where pusherpool didn't start and broke some rooms
\| * \| \| \|	Fix bug where pusherpool didn't start and broke some rooms	Erik Johnston	2017-07-06	3	-10/+11
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we didn't instansiate the PusherPool at start time it could fail at run time, which it did for some users. This may or may not fix things for those users, but it should happen at start time and stop the server from starting.
* \| \| \|	Merge pull request #2309 from matrix-org/erikj/user_ip_repl	Erik Johnston	2017-07-06	6	-17/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix up user_ip replication commands
\| * \| \| \|	Serialize user ip command as json	Erik Johnston	2017-06-27	1	-5/+9
\| \| \| \| \|
\| * \| \| \|	Fix up	Erik Johnston	2017-06-27	5	-12/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-07-06	2	-1/+23
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0	Erik Johnston	2017-07-06	91	-488/+3929
\| \|\ \ \ \
\| \| * \| \| \|	Bump version and changelog github/release-v0.22.0 release-v0.22.0	Erik Johnston	2017-07-06	2	-1/+7
\| \| \| \| \| \|
\| \| * \| \| \|	Bump version and changelog v0.22.0-rc2	Erik Johnston	2017-07-04	2	-1/+17
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2334 from matrix-org/erikj/refactor_transport_server	Erik Johnston	2017-07-05	1	-8/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separate federation servlet into different lists
\| * \| \| \| \| \|	Separate federation servlet into different lists	Erik Johnston	2017-07-05	1	-8/+16
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #2332 from matrix-org/rav/fix_pushes	Richard van der Hoff	2017-07-05	1	-1/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix caching error in the push evaluator
\| * \| \| \| \|	Fix caching error in the push evaluator	Richard van der Hoff	2017-07-05	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initialising `result` to `{}` in the parameters meant that every call to _flatten_dict used the same target dictionary. I'm hopeful this will fix https://github.com/matrix-org/synapse/issues/2270, but I suspect it won't. (This code seems to have been here since forever, unlike the bug, and I don't really think it explains the observed behaviour). Still, it makes it hard to investigate the problem.
* \| \| \| \| \|	Merge pull request #2330 from matrix-org/erikj/cache_size_factor	Erik Johnston	2017-07-04	8	-30/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase default cache size
\| * \| \| \| \| \|	Update test	Erik Johnston	2017-07-04	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update README	Erik Johnston	2017-07-04	1	-7/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Increase default cache factor size.	Erik Johnston	2017-07-04	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Define CACHE_SIZE_FACTOR once	Erik Johnston	2017-07-04	5	-21/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2323 from matrix-org/markjh/invite_checks	Mark Haines	2017-07-04	1	-2/+17
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Improve the error handling for bad invites received over federation
\| * \| \| \| \| \|	Improve the error handling for bad invites received over federation	Mark Haines	2017-06-30	1	-2/+17
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2321 from matrix-org/erikj/prefill_forward	Erik Johnston	2017-06-30	2	-2/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefill forward extrems and event to state groups
\| * \| \| \| \| \|	Make into list	Erik Johnston	2017-06-29	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Prefill forward extrems and event to state groups	Erik Johnston	2017-06-29	2	-2/+13
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2320 from matrix-org/erikj/cache_macaroon_parse	Erik Johnston	2017-06-29	1	-13/+60
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache macaroon parse and validation
\| * \| \| \| \| \|	Cache macaroon parse and validation	Erik Johnston	2017-06-29	1	-13/+60
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out this can be quite expensive for requests, and is easily cachable. We don't cache the lookup to the DB so invalidation still works.
* \| \| \| \| \|	Merge pull request #2319 from matrix-org/erikj/prune_sessions	Erik Johnston	2017-06-29	2	-11/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use an ExpiringCache for storing registration sessions
\| * \| \| \| \| \|	Use an ExpiringCache for storing registration sessions	Erik Johnston	2017-06-29	2	-11/+13
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is because pruning them was a significant performance drain on matrix.org
* \| \| \| \| \|	Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-06-27	2	-1/+35
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update version and changelog v0.22.0-rc1	Erik Johnston	2017-06-26	2	-1/+35
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2308 from matrix-org/erikj/user_ip_repl	Erik Johnston	2017-06-27	9	-8/+111
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|	Make workers report to master for user ip updates
\| * \| \| \| \| \|	Make workers report to master for user ip updates	Erik Johnston	2017-06-27	9	-8/+111
\| \| \| \| \| \| \|