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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-27	1	-36/+51
\|\
\| *	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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-24	53	-637/+1079
\|\\|
\| *	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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-21	5	-54/+39
\|\\| \| \| \|
\| * \| \| \|	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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-21	19	-163/+928
\|\\| \| \| \| \|
\| * \| \| \| \|	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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-16	11	-54/+98
\|\\| \| \| \| \|
\| * \| \| \| \|	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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-15	14	-59/+152
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-15	1	-0/+6
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	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 branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-15	36	-317/+1082
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	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`
\| \| * \| \| \| \| \|	re-refactor exception heirarchy	Richard van der Hoff	2017-03-14	1	-16/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Give CodeMessageException back its `msg` attribute, and use that to hold the HTTP status message for HttpResponseException.
\| \| * \| \| \| \| \|	Fix routing loop when fetching remote media	Richard van der Hoff	2017-03-13	4	-14/+102
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we proxy a media request to a remote server, add a query-param, which will tell the remote server to 404 if it doesn't recognise the server_name. This should fix a routing loop where the server keeps forwarding back to itself. Also improves the error handling on remote media fetches, so that we don't always return a rather obscure 502.
\| * \| \| \| \| \|	Merge pull request #2002 from matrix-org/erikj/dont_sync_by_default	Erik Johnston	2017-03-14	1	-13/+31
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce number of spurious sync result generations.
\| \| * \| \| \| \| \|	Reduce spurious calls to generate sync	Erik Johnston	2017-03-14	1	-13/+31
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #1989 from matrix-org/erikj/public_list_speed	Erik Johnston	2017-03-14	7	-33/+76
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Speed up public room list
\| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2017-03-14	26	-592/+492
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	erikj/public_list_speed
\| * \| \| \| \| \|	Merge pull request #1996 from matrix-org/erikj/fix_current_state	Erik Johnston	2017-03-14	1	-3/+28
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix current_state_events table to not lie
\| \| * \| \| \| \| \|	Fix current_state_events table to not lie	Erik Johnston	2017-03-14	1	-3/+28
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we try and persist two state events that have the same ancestor we calculate the wrong current state when persisting those events.
\| * \| \| \| \| \|	Merge pull request #1993 from matrix-org/luke/delete-devices	Luke Barnard	2017-03-14	4	-0/+139
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|	Implement delete_devices API
\| \| * \| \| \| \|	Implement _simple_delete_many_txn, use it to delete devices	Luke Barnard	2017-03-13	4	-11/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(But this doesn't implement the same for deleting access tokens or e2e keys. Also respond to code review.
\| \| * \| \| \| \|	Flake	Luke Barnard	2017-03-13	1	-0/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Implement delete_devices API	Luke Barnard	2017-03-13	1	-0/+47
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This implements the proposal here https://docs.google.com/document/d/1C-25Gqz3TXy2jIAoeOKxpNtmme0jI4g3yFGqv5GlAAk for deleting multiple devices at once in a single request.
\| * \| \| \| \|	Merge pull request #1990 from matrix-org/rav/log_config_comments	Richard van der Hoff	2017-03-13	2	-7/+11
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Add helpful texts to logger config options
\| \| * \| \| \|	Bring example log config into line with default	Richard van der Hoff	2017-03-13	1	-2/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Add helpful texts to logger config options	Richard van der Hoff	2017-03-13	1	-5/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #1978 from matrix-org/rav/refactor_received_pdu	Richard van der Hoff	2017-03-13	2	-163/+207
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Refactor FederationServer._handle_new_pdu
\| \| * \| \| \|	Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pdu	Richard van der Hoff	2017-03-13	22	-423/+160
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #1983 from matrix-org/rav/no_redirect_stdio	Richard van der Hoff	2017-03-13	9	-14/+38
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an option to disable stdio redirect
\| \| * \| \| \| \|	Add an option to disable stdio redirect	Richard van der Hoff	2017-03-10	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it tractable to run synapse under pdb.
\| \| * \| \| \| \|	Refactor logger config for workers	Richard van der Hoff	2017-03-10	9	-13/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- to make it easier to add more config options.
\| * \| \| \| \| \|	Merge pull request #1982 from matrix-org/rav/sighup_for_logconfig	Richard van der Hoff	2017-03-13	1	-10/+19
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Reread log config on SIGHUP
\| \| * \| \| \| \|	Reread log config on SIGHUP	Richard van der Hoff	2017-03-10	1	-10/+19
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we are using a log_config file, reread it on SIGHUP.
\| \| \| * \| \|	Move FederationServer._handle_new_pdu to FederationHandler	Richard van der Hoff	2017-03-09	2	-198/+198
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unfortunately this significantly increases the size of the already-rather-big FederationHandler, but the code fits more naturally here, and it paves the way for the tighter integration that I need between handling incoming PDUs and doing the join dance. Other than renaming the existing `FederationHandler.on_receive_pdu` to `_process_received_pdu` to make way for it, this just consists of the move, and replacing `self.handler` with `self` and `self` with `self.replication_layer`.
\| \| \| * \| \|	Move sig check out of _handle_new_pdu	Richard van der Hoff	2017-03-09	1	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we receive PDUs via `get_missing_events`, we have already checked their sigs, so there is no need to do it again.
\| \| \| * \| \|	Factor _get_missing_events_for_pdu out of _handle_new_pdu	Richard van der Hoff	2017-03-09	1	-62/+82
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should be functionally identical: it just seeks to improve readability by reducing indentation.
\| \| \| * \|	Add new storage function to slave store	Erik Johnston	2017-03-13	1	-0/+4
\| \| \| \| \|
\| \| \| * \|	Comments	Erik Johnston	2017-03-13	1	-0/+12
\| \| \| \| \|
\| \| \| * \|	Assume rooms likely haven't changed	Erik Johnston	2017-03-13	2	-8/+14
\| \| \| \| \|
\| \| \| * \|	Get current state by using current_state_events table	Erik Johnston	2017-03-10	5	-31/+52
\| \| \| \| \|
* \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-13	14	-401/+104
\|\\| \| \| \|
\| * \| \| \|	Revert "Support registration & login with phone number"	Erik Johnston	2017-03-13	9	-395/+50
\| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #1976 from matrix-org/erikj/device_delete_sync	Erik Johnston	2017-03-10	3	-4/+46
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Noop repated delete device inbox calls from /sync
\| \| * \| \|	Fix it for the workers	Erik Johnston	2017-03-10	1	-0/+8
\| \| \| \| \|
\| \| * \| \|	Noop repated delete device inbox calls from /sync	Erik Johnston	2017-03-10	2	-4/+38
\| \|/ / /
\| * / /	Add setdefault key to ExpiringCache	Erik Johnston	2017-03-10	1	-0/+7
\| \|/ /
\| * \|	Fix docstring	Richard van der Hoff	2017-03-09	1	-2/+1
\| \| \|
* \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-09	9	-50/+395
\|\\| \|
\| * \|	Merge pull request #1971 from matrix-org/dbkr/msisdn_signin	David Baker	2017-03-09	9	-50/+395
\| \|\ \ \| \| \| \| \| \| \| \|	Support registration & login with phone number
\| \| * \|	Comment when our 3pids would be incomplete	David Baker	2017-03-08	1	-0/+2
\| \| \| \|
\| \| * \|	Docs	David Baker	2017-03-08	1	-0/+13
\| \| \| \|
\| \| * \|	Incorrectly copied copyright	David Baker	2017-03-08	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This file post-dates OM
\| \| * \|	Not any more, it doesn't	David Baker	2017-03-08	1	-1/+0
\| \| \| \|
\| \| * \|	Better error message	David Baker	2017-03-08	1	-1/+3
\| \| \| \|
\| \| * \|	pep8	David Baker	2017-03-08	2	-1/+2
\| \| \| \|
\| \| * \|	Add msisdn util file	David Baker	2017-03-08	1	-0/+27
\| \| \| \|
\| \| * \|	Pull out datastore in initialiser	David Baker	2017-03-08	1	-5/+10
\| \| \| \|
\| \| * \|	Minor fixes from PR feedback	David Baker	2017-03-08	2	-5/+3
\| \| \| \|
\| \| * \|	Fix log line	David Baker	2017-03-08	1	-1/+1
\| \| \| \|
\| \| * \|	Typos	David Baker	2017-03-08	1	-2/+2
\| \| \| \|
\| \| * \|	Refector out assert_params_in_request	David Baker	2017-03-08	3	-37/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and replace requestEmailToken where we meant requestMsisdnToken
\| \| * \|	Factor out msisdn canonicalisation	David Baker	2017-03-08	4	-41/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Plus a couple of other minor fixes
\| \| * \|	Fix pep8	David Baker	2017-03-08	4	-7/+7
\| \| \| \|
\| \| * \|	Support new login format	David Baker	2017-03-07	1	-6/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://docs.google.com/document/d/1-6ZSSW5YvCGhVFDyD2QExAUAdpCWjccvJT5xiyTTG2Y/edit#
\| \| * \|	Add msisdns as 3pids during registration	David Baker	2017-03-03	1	-0/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and support binding them with the bind_msisdn param
\| \| * \|	Just return the deferred straight off	David Baker	2017-03-01	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	defer.returnValue doth not maketh a generator: it would need a yield to be a generator, and this doesn't need a yield.
\| \| * \|	Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin	David Baker	2017-03-01	41	-193/+816
\| \| \|\ \
\| \| * \| \|	WIP support for msisdn 3pid proxy methods	David Baker	2017-02-14	6	-19/+228
\| \| \| \| \|
* \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-03-09	6	-62/+180
\|\\| \| \| \|
\| * \| \| \|	Remove spurious SQL logging (#1972)	Richard van der Hoff	2017-03-08	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	looks like the upsert function was accidentally sending sql logging to the general logger. We already log the sql in `txn.execute`.
\| * \| \| \|	Merge pull request #1969 from matrix-org/erikj/get_distinct_devices	Erik Johnston	2017-03-06	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Select distinct devices from DB
\| \| * \| \| \|	Select distinct devices from DB	Erik Johnston	2017-03-06	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise we might pull out tonnes of duplicate user_ids and this can make synapse sad.
\| * \| \| \|	Merge pull request #1964 from matrix-org/erikj/device_list_update_fix	Erik Johnston	2017-03-03	1	-47/+123
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix device list update to not constantly resync
\| \| * \| \| \|	Don't keep around old stream IDs forever	Erik Johnston	2017-03-03	1	-2/+9
\| \| \| \| \| \|
\| \| * \| \| \|	Spelling	Erik Johnston	2017-03-03	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Fix device list update to not constantly resync	Erik Johnston	2017-03-01	1	-46/+115
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #1963 from matrix-org/erikj/delete_old_device_streams	Erik Johnston	2017-03-03	2	-0/+34
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|	Clobber old device list stream entries
\| \| * \| \| \|	Fix up	Erik Johnston	2017-03-03	2	-8/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Add index to device_lists_stream	Erik Johnston	2017-03-01	3	-4/+28
\| \| \| \| \| \|
\| \| * \| \| \|	Clobber old device list stream entries	Erik Johnston	2017-03-01	1	-0/+10
\| \| \|/ / /
\| * \| \| \|	kick jenkins	Paul "LeoNerd" Evans	2017-03-01	0	-0/+0
\| \| \| \| \|
\| * \| \| \|	Merge pull request #1960 from matrix-org/paul/sytest-integration	Paul Evans	2017-03-01	2	-6/+22
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Prepare a script for Jenkins to run sytest via dendron+haproxy
\| \| * \| \|	Added also a control script to run via the crazy dendron+haproxy hybrid ↵	Paul "LeoNerd" Evans	2017-02-28	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	we're temporarily using
\| \| * \| \|	No longer need to request all the sub-components to be split when running ↵	Paul "LeoNerd" Evans	2017-02-28	1	-6/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	sytest+dendron
* \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-02-28	1	-1/+3
\|\\| \| \|
\| * \| \|	Don't log unknown cache warnings in workers	Erik Johnston	2017-02-28	1	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-02-28	3	-4/+19
\|\\| \| \|
\| * \| \|	Merge pull request #1959 from matrix-org/erikj/intern_once	Erik Johnston	2017-02-28	1	-3/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Intern table column names once
\| \| * \| \|	Intern table column names once	Erik Johnston	2017-02-28	1	-3/+2
\| \| \| \| \|
\| * \| \| \|	Merge pull request #1957 from matrix-org/device_poke_index	Erik Johnston	2017-02-28	2	-1/+17
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Add stream_id index to device_lists_outbound_pokes
\| \| * \| \|	Add stream_id index to device_lists_outbound_pokes	Erik Johnston	2017-02-28	2	-1/+17
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	As this is used for replication streaming
* \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-02-28	5	-3/+19
\|\\| \| \|
\| * \| \|	Fix up txn name	Erik Johnston	2017-02-28	1	-1/+1
\| \| \| \|
\| * \| \|	Pop with default value to stop throwing	Erik Johnston	2017-02-28	1	-1/+1
\| \| \| \|
\| * \| \|	merge in right archlinux package, thanks to @saram-kon from ↵	Matthew Hodgson	2017-02-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/matrix-org/synapse/pull/1956
\| * \| \|	Merge pull request #1955 from matrix-org/erikj/current_state_query_bypass	Erik Johnston	2017-02-27	1	-0/+15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Don't fetch current state in common case
\| \| * \| \|	Remove needless check	Erik Johnston	2017-02-27	1	-2/+0
\| \| \| \| \|
\| \| * \| \|	It should be all	Erik Johnston	2017-02-27	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Don't fetch current state in common case	Erik Johnston	2017-02-27	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we fetch the list of current state events whenever we send something in a room. This is overkill for the common case of persisting a simple chain of non-state events, so lets handle that case specially.
\| * \| \| \|	Pop rather than del from dict	Erik Johnston	2017-02-27	1	-1/+1
\| \|/ / /
\| * \| \|	Merge pull request #1904 from Pneumaticat/patch-1	Erik Johnston	2017-02-27	1	-0/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix synapse_port_db failure (fixes #1902)
\| \| * \| \|	Fix typo	Kevin Liu	2017-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is what I get for not proofreading
\| \| * \| \|	Fix synapse_port_db failure (fixes #1902)	Kevin Liu	2017-02-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://matrix.to/#/!cURbafjkfsMDVwdRDQ:matrix.org/$148686272020hCgRD:potatofrom.space Signed-off-by: Kevin Liu <kevin@potatofrom.space>
* \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2017-02-27	Erik Johnston	2017-02-27	5	-51/+84
\|\\| \| \| \|
\| * \| \| \|	Merge pull request #1954 from matrix-org/erikj/cache_device2	Erik Johnston	2017-02-27	1	-45/+73
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cache get_user_devices_from_cache
\| \| * \| \| \|	Cache get_user_devices_from_cache	Erik Johnston	2017-02-27	1	-45/+73
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #1951 from enckse/develop	Matthew Hodgson	2017-02-27	1	-3/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the aur package is no longer there, community package in arch does exist
\| \| * \| \| \| \|	the aur package is no longer there, community package in arch does exist	Sean Enck	2017-02-27	1	-3/+2
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #1945 from jkolo/fix_dynamic_thumbnails_aspect	Erik Johnston	2017-02-27	1	-0/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #1677 (dynamic thumbnails aspect)
\| \| * \| \| \| \|	Fix dynamic thumbnails aspect	Jurek	2017-02-24	1	-0/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #1939 from matrix-org/erikj/strip_sql_newlines	Erik Johnston	2017-02-23	1	-0/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip newlines from SQL queries
\| \| * \| \| \| \| \|	Strip newlines from SQL queries	Erik Johnston	2017-02-23	1	-0/+6
\| \|/ / / / / /
\| * \| \| \| \| \|	Remove lock from rotate notifs	Erik Johnston	2017-02-22	1	-3/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Ensure we pass positive ints to delay function	Erik Johnston	2017-02-22	1	-1/+2
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Local changes 2017-02-27-before	Matrix	2017-02-24	7	-7/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-02-21	10	-26/+148
\|\\| \| \| \| \|
\| * \| \| \| \|	Store looping call	Erik Johnston	2017-02-21	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-02-21	2	-1/+8
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse v0.19.2	Erik Johnston	2017-02-21	4	-4/+13
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Bump version and changelog github/release-v0.19.2 release-v0.19.2	Erik Johnston	2017-02-21	2	-1/+8
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Remove unused param	Erik Johnston	2017-02-20	2	-2/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Fix /context/ visibiltiy rules	Erik Johnston	2017-02-20	1	-1/+4
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #1930 from matrix-org/rav/fix_txnq_race	Richard van der Hoff	2017-02-21	1	-9/+21
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a race in transaction queue
\| \| * \| \| \| \|	Fix a race in transaction queue	Richard van der Hoff	2017-02-20	1	-9/+21
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was theoretically possible for a PDU to get queued and not sent for ages. On closer inspection I think there were bigger problems elsewhere, but we might as well fix this since it's easy.
\| * \| \| \| \|	Merge pull request #1929 from matrix-org/erikj/context_fix	Erik Johnston	2017-02-20	2	-3/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix /context/ visibiltiy rules
\| \| * \| \| \| \|	Remove unused param	Erik Johnston	2017-02-20	2	-2/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix /context/ visibiltiy rules	Erik Johnston	2017-02-20	1	-1/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2017-02-20	1	-11/+21
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| / / / / \| \| \|/ / / /
\| \| * \| \| \|	Update metrics-howto.rst	Richard van der Hoff	2017-02-19	1	-0/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Update metrics-howto.rst	Richard van der Hoff	2017-02-19	1	-12/+18
\| \| \| \| \| \|
\| \| * \| \| \|	Update metrics-howto.rst	Richard van der Hoff	2017-02-19	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fix up notif rotation	Erik Johnston	2017-02-18	1	-14/+22
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #1926 from matrix-org/rav/example_log_config	Richard van der Hoff	2017-02-17	1	-0/+48
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an example log_config file
\| \| * \| \| \| \|	Update example_log_config.yaml	Richard van der Hoff	2017-02-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add trailing NL
\| \| * \| \| \| \|	Add an example log_config file	Richard van der Hoff	2017-02-17	1	-0/+48
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #1925 from matrix-org/dbkr/pushers_lang_lengthen	David Baker	2017-02-17	1	-0/+39
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the pushers lang field column longer
\| \| * \| \| \| \| \|	Use TEXT rather than VARCHAR	David Baker	2017-02-17	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While we're changing anyway
\| \| * \| \| \| \| \|	Make the pushers lang field column longer	David Baker	2017-02-17	1	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To accommodate things like zh-Hans-CN Fixes https://github.com/vector-im/riot-ios/issues/1031
\| * \| \| \| \| \| \|	Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_ban	David Baker	2017-02-17	1	-1/+3
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|	Allow forgetting rooms you're banned from
\| \| * \| \| \| \| \|	Allow forgetting rooms you're banned from	David Baker	2017-02-15	1	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Don't limit count	Erik Johnston	2017-02-21	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix up notif rotation	Erik Johnston	2017-02-18	1	-14/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes	Erik Johnston	2017-02-16	9	-81/+460
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #1923 from matrix-org/erikj/push_action_compress	Erik Johnston	2017-02-16	1	-11/+50
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store the default push actions in a more efficient manner
\| \| * \| \| \| \| \| \|	Comment	Erik Johnston	2017-02-16	1	-1/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Comment	Erik Johnston	2017-02-16	1	-7/+14
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Store the default push actions in a more efficient manner	Erik Johnston	2017-02-16	1	-11/+40
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge pull request #1916 from matrix-org/erikj/push_actions_delete	Erik Johnston	2017-02-16	5	-57/+340
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aggregate event push actions
\| \| * \| \| \| \| \| \|	Less aggressive timers	Erik Johnston	2017-02-14	1	-2/+2
\| \| \| \| \| \| \| \| \|