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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/develop' into ↵	Richard van der Hoff	2019-05-31	12	-129/+147
\|\ \| \| \| \| \| \|	rav/server_keys/05-rewrite-gsvk-again
\| *	Merge pull request #5300 from ↵	Richard van der Hoff	2019-05-31	2	-25/+9
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/rav/server_keys/06-fix-serverkeys-handling Remove some pointless exception handling
\| \| *	Remove some pointless exception handling	Richard van der Hoff	2019-05-30	2	-25/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The verify_request deferred already returns a suitable SynapseError, so I don't really know what we expect to achieve by doing more wrapping, other than log spam. Fixes #4278.
\| * \|	Merge pull request #5296 from ↵	Richard van der Hoff	2019-05-31	2	-17/+22
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/rav/server_keys/04-use-attrs-for_verify-request use attr.s for VerifyKeyRequest
\| \| *	use attr.s for VerifyKeyRequest	Richard van der Hoff	2019-05-30	2	-17/+22
\| \| \| \| \| \| \| \| \| \| \| \|	because namedtuple is awful
\| * \|	Merge pull request #5293 from Kagamihime/messages-federation-format	Erik Johnston	2019-05-31	2	-0/+3
\| \|\ \ \| \| \| \| \| \| \| \|	Fix ignored filter field in `/messages` endpoint
\| \| * \|	Add changelog	Eisha Chen-yen-su	2019-05-30	1	-0/+1
\| \| \| \|
\| \| * \|	Fix ignored filter field in `/messages` endpoint	Eisha Chen-yen-su	2019-05-30	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug which were causing the "event_format" field to be ignored in the filter of requests to the `/messages` endpoint of the CS API. Signed-off-by: Eisha Chen-yen-su <chenyensu0@gmail.com>
\| * \| \|	Merge pull request #5294 from matrix-org/erikj/speed_up_room_stats	Erik Johnston	2019-05-31	5	-87/+112
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Speed up room stats background update
\| \| * \| \|	Newsfile	Erik Johnston	2019-05-31	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Add indices. Remove room_ids accidentally added	Erik Johnston	2019-05-31	2	-13/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have to do this by re-inserting a background update and recreating tables, as the tables only get created during a background update and will later be deleted. We also make sure that we remove any entries that should have been removed but weren't due to a race that has been fixed in a previous commit.
\| \| * \| \|	Join against events to use its room_id index	Erik Johnston	2019-05-30	1	-1/+6
\| \| \| \| \|
\| \| * \| \|	Move deletion from table inside txn	Erik Johnston	2019-05-30	1	-2/+5
\| \| \| \| \|
\| \| * \| \|	Fetch membership counts all at once	Erik Johnston	2019-05-30	2	-38/+18
\| \| \| \| \|
\| \| * \| \|	Get events all at once	Erik Johnston	2019-05-30	1	-33/+26
\| \| \| \| \|
\| * \| \| \|	Clarify that the admin change password endpoint logs them out (#5303)	Travis Ralston	2019-05-31	2	-1/+2
\| \| \| \| \|
* \| \| \| \|	Rewrite get_server_verify_keys, again.	Richard van der Hoff	2019-05-30	2	-48/+54
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempt to simplify the logic in get_server_verify_keys by splitting it into two methods.
* \| \| \|	Merge branch 'master' into develop	Erik Johnston	2019-05-30	3	-3/+17
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	0.99.5.2 v0.99.5.2 github/release-v0.99.5 release-v0.99.5	Erik Johnston	2019-05-30	6	-4/+16
\| \| \| \|
\| * \| \|	fix changelog for 0.99.5.1 (#5270)	Richard van der Hoff	2019-05-30	1	-2/+1
\| \| \| \|
\| * \| \|	Newsfile	Erik Johnston	2019-05-30	1	-0/+1
\| \| \| \|
\| * \| \|	Add index to temp table	Erik Johnston	2019-05-30	1	-0/+1
\| \| \| \|
\| * \| \|	Update synapse/storage/events_bg_updates.py	Erik Johnston	2019-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| * \| \|	Rename constant	Erik Johnston	2019-05-30	1	-3/+3
\| \| \| \|
\| * \| \|	Move event background updates to a separate file	Erik Johnston	2019-05-30	3	-369/+405
\| \| \| \|
\| * \| \|	Fixup comments and logging	Erik Johnston	2019-05-30	2	-9/+15
\| \| \| \|
\| * \| \|	Newsfile	Erik Johnston	2019-05-30	1	-0/+1
\| \| \| \|
\| * \| \|	Add test	Erik Johnston	2019-05-30	1	-0/+248
\| \| \| \|
\| * \| \|	Log actual number of entries deleted	Erik Johnston	2019-05-30	2	-5/+13
\| \| \| \|
\| * \| \|	Add DB bg update to cleanup extremities.	Erik Johnston	2019-05-30	2	-0/+205
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to #5269 we may have extremities in our DB that we shouldn't have, so lets add a cleanup task such to remove those.
\| * \| \|	Correctly filter out extremities with soft failed prevs (#5274)	Erik Johnston	2019-05-30	2	-3/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we receive a soft failed event we, correctly, do not update the forward extremity table with the event. However, if we later receive an event that references the soft failed event we then need to remove the soft failed events prev events from the forward extremities table, otherwise we just build up forward extremities. Fixes #5269
* \| \| \|	Merge pull request #5291 from matrix-org/erikj/add_index	Erik Johnston	2019-05-30	2	-0/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Add index to temp bg update extremity table
\| * \| \|	Newsfile	Erik Johnston	2019-05-30	1	-0/+1
\| \| \| \|
\| * \| \|	Add index to temp table	Erik Johnston	2019-05-30	1	-0/+1
\|/ / /
* \| \|	Merge pull request #5278 from matrix-org/erikj/cleanup_bad_extremities	Erik Johnston	2019-05-30	7	-181/+685
\|\ \ \ \| \| \| \| \| \| \| \|	Add DB bg update to cleanup extremities.
\| * \| \|	Update synapse/storage/events_bg_updates.py	Erik Johnston	2019-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| * \| \|	Rename constant	Erik Johnston	2019-05-30	1	-3/+3
\| \| \| \|
\| * \| \|	Move event background updates to a separate file	Erik Johnston	2019-05-30	3	-369/+405
\| \| \| \|
\| * \| \|	Fixup comments and logging	Erik Johnston	2019-05-30	2	-9/+15
\| \| \| \|
\| * \| \|	Newsfile	Erik Johnston	2019-05-29	1	-0/+1
\| \| \| \|
\| * \| \|	Add test	Erik Johnston	2019-05-29	1	-0/+248
\| \| \| \|
\| * \| \|	Log actual number of entries deleted	Erik Johnston	2019-05-29	2	-5/+13
\| \| \| \|
\| * \| \|	Add DB bg update to cleanup extremities.	Erik Johnston	2019-05-29	2	-0/+205
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to #5269 we may have extremities in our DB that we shouldn't have, so lets add a cleanup task such to remove those.
* \| \| \|	Merge pull request #5256 from aaronraimist/logout-correct-error	Erik Johnston	2019-05-30	2	-18/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Show correct error when logging out and access token is missing
\| * \| \| \|	Lint	Aaron Raimist	2019-05-29	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
\| * \| \| \|	Get rid of try except	Aaron Raimist	2019-05-27	1	-16/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
\| * \| \| \|	Add changelog	Aaron Raimist	2019-05-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
\| * \| \| \|	Show correct error when logging out and access token is missing	Aaron Raimist	2019-05-24	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
* \| \| \| \|	Remove spurious debug from MatrixFederationHttpClient.get_json (#5287) v0.99.5.1.dev0	Richard van der Hoff	2019-05-29	2	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is just unhelpful spam
* \| \| \| \|	Improve logging for logcontext leaks. (#5288)	Richard van der Hoff	2019-05-29	2	-9/+14
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5283 from aaronraimist/captcha-docs	Erik Johnston	2019-05-29	2	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Specify the type of reCAPTCHA key to use (#5013)
\| * \| \| \| \|	Add changelog	Aaron Raimist	2019-05-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
\| * \| \| \| \|	Specify the type of reCAPTCHA key to use (#5013)	Aaron Raimist	2019-05-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
* \| \| \| \| \|	Implement the SHHS complexity API (#5216)	Amber Brown	2019-05-30	6	-5/+180
\| \| \| \| \| \|
* \| \| \| \| \|	Serve CAS login over r0 (#5286)	Amber Brown	2019-05-30	2	-2/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Fix error when downloading thumbnail with width/height param missing (#5258)	Aaron Raimist	2019-05-29	2	-2/+3
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when downloading thumbnail with width/height param missing Fixes #2748 Signed-off-by: Aaron Raimist <aaron@raim.ist>
* \| \| \| \|	Correctly filter out extremities with soft failed prevs (#5274)	Erik Johnston	2019-05-29	2	-3/+80
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we receive a soft failed event we, correctly, do not update the forward extremity table with the event. However, if we later receive an event that references the soft failed event we then need to remove the soft failed events prev events from the forward extremities table, otherwise we just build up forward extremities. Fixes #5269
* \| \| \|	Fix dropped logcontexts during high outbound traffic. (#5277)	Richard van der Hoff	2019-05-29	2	-7/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #5271.
* \| \| \|	Merge pull request #5282 from aaronraimist/user-directory	Amber Brown	2019-05-29	4	-13/+10
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix docs on resetting the user directory (#5036)
\| * \| \|	regenerate sample config	Amber Brown	2019-05-29	1	-3/+3
\| \| \| \|
\| * \| \|	Rename 5282.misc to 5282.doc	Amber Brown	2019-05-29	1	-0/+0
\| \| \| \|
\| * \| \|	Add changelog	Aaron Raimist	2019-05-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
\| * \| \|	Fix docs on resetting the user directory (#5036)	Aaron Raimist	2019-05-28	2	-10/+6
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
* \| \|	Merge pull request #5251 from matrix-org/rav/server_keys/01-check_sig	Richard van der Hoff	2019-05-28	3	-50/+168
\|\ \ \ \| \| \| \| \| \| \| \|	Ensure that server_keys fetched via a notary server are correctly signed.
\| * \| \|	changelog	Richard van der Hoff	2019-05-24	1	-0/+1
\| \| \| \|
\| * \| \|	Improve error handling/logging for perspectives-key fetching.	Richard van der Hoff	2019-05-24	1	-28/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In particular, don't give up on the first failure.
\| * \| \|	Require sig from origin server on perspectives responses	Richard van der Hoff	2019-05-23	2	-22/+90
\| \| \| \|
* \| \| \|	Fix "db txn 'update_presence' from sentinel context" log messages (#5275)	Richard van der Hoff	2019-05-28	2	-52/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4414.
* \| \| \|	Merge pull request #5268 from matrix-org/babolivier/account_validity_fix_schema	Brendan Abolivier	2019-05-28	2	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix schema update for account validity
\| * \| \| \|	Changelog	Brendan Abolivier	2019-05-28	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix schema update for account validity	Brendan Abolivier	2019-05-28	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5260 from matrix-org/travis/fix-room-bg-task	Erik Johnston	2019-05-25	2	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix logging for room stats background update
\| * \| \| \| \|	Changelog	Travis Ralston	2019-05-25	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix logging for room stats background update	Travis Ralston	2019-05-25	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5257 from aaronraimist/fix-error-code-publicrooms	Erik Johnston	2019-05-25	2	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error code for invalid parameter
\| * \| \| \| \| \|	Add changelog	Aaron Raimist	2019-05-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
\| * \| \| \| \| \|	Fix error code for invalid parameter	Aaron Raimist	2019-05-24	1	-1/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Aaron Raimist <aaron@raim.ist>
* / \| \| \| \|	Simplification to Keyring.wait_for_previous_lookups. (#5250)	Richard van der Hoff	2019-05-24	3	-9/+7
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The list of server names was redundant, since it was equivalent to the keys on the server_to_deferred map. This reduces the number of large lists being passed around, and has the benefit of deduplicating the entries in `wait_on`.
* \| \| \| \|	Fix appservice timestamp massaging (#5233)	Tulir Asokan	2019-05-24	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tulir Asokan <tulir@maunium.net>
* \| \| \| \|	Add missing blank line in config (#5249)	Richard van der Hoff	2019-05-24	3	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events	Erik Johnston	2019-05-24	5	-2/+13
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Don't bundle aggregations with events in /sync or /events or state queries
\| * \| \| \|	Don't bundle aggs for /state and /members etc APIs	Erik Johnston	2019-05-24	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Newsfile	Erik Johnston	2019-05-21	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Don't bundle events in /sync or /events	Erik Johnston	2019-05-21	3	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As we'll send down the annotations too anyway, so this just ends up confusing clients.
* \| \| \| \|	Merge pull request #5244 from matrix-org/rav/server_keys/00-factor-out-fetchers	Erik Johnston	2019-05-23	4	-149/+207
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Factor out KeyFetchers from KeyRing
\| * \| \| \|	Fix remote_key_resource	Richard van der Hoff	2019-05-23	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Factor out KeyFetchers from KeyRing	Richard van der Hoff	2019-05-23	3	-146/+204
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than have three methods which have to have the same interface, factor out a separate interface which is provided by three implementations. I find it easier to grok the code this way.
* \| \| \| \|	Add config option for setting homeserver's default room version (#5223)	Andrew Morgan	2019-05-23	7	-10/+57
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file.
* \| \| \|	Store key validity time in the storage layer	Richard van der Hoff	2019-05-23	6	-46/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a first step to checking that the key is valid at the required moment. The idea here is that, rather than passing VerifyKey objects in and out of the storage layer, we instead pass FetchKeyResult objects, which simply wrap the VerifyKey and add a valid_until_ts field.
* \| \| \|	Simplify process_v2_response (#5236)	Richard van der Hoff	2019-05-23	2	-21/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Pass time_added_ms into process_v2_response * Simplify process_v2_response We can merge old_verify_keys into verify_keys, and reduce the number of dicts flying around.
* \| \| \|	Remove unused VerifyKey.expired and .time_added fields (#5235)	Richard van der Hoff	2019-05-23	2	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were never used, and poking arbitary data into objects from other packages seems confusing at best.
* \| \| \|	Rewrite store_server_verify_key to store several keys at once (#5234)	Richard van der Hoff	2019-05-23	5	-87/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Storing server keys hammered the database a bit. This replaces the implementation which stored a single key, with one which can do many updates at once.
* \| \| \|	Simplifications and comments in do_auth (#5227)	Richard van der Hoff	2019-05-23	3	-121/+183
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I was staring at this function trying to figure out wtf it was actually doing. This is (hopefully) a non-functional refactor which makes it a bit clearer.
* \| \| \|	Run black on synapse.crypto.keyring (#5232)	Richard van der Hoff	2019-05-22	2	-149/+138
\| \| \| \|
* \| \| \|	Merge branch 'master' into develop	Neil Johnson	2019-05-22	3	-3/+11
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	0.99.5.1 v0.99.5.1	Neil Johnson	2019-05-22	3	-3/+11
\| \| \| \|
\| * \| \|	Revert "0.99.5"	Neil Johnson	2019-05-22	3	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c31e375ade1b59a7fe38628337e9e1aa3de91feb.
\| * \| \|	0.99.5	Neil Johnson	2019-05-22	3	-3/+11
\| \| \| \|
* \| \| \|	remove urllib3 pin (#5230)	Marcus Hoffmann	2019-05-22	2	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requests 2.22.0 as been released supporting urllib3 1.25.2 Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
* \| \| \|	Merge branch 'master' into develop	Neil Johnson	2019-05-22	3	-1/+11
\|\\| \| \|
\| * \| \|	0.99.5 v0.99.5	Neil Johnson	2019-05-22	3	-1/+11
\| \| \| \|
* \| \| \|	Neilj/ensure get profileinfo available in client reader slaved store (#5213)	Neil Johnson	2019-05-22	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	* expose SlavedProfileStore to ClientReaderSlavedStore
* \| \| \|	Update README.md (#5222)	Steffen	2019-05-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Add missing backslash
* \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2019-05-22	28	-27/+40
\|\\| \| \|
\| * \| \|	update changelog v0.99.5rc1	Richard van der Hoff	2019-05-21	3	-3/+1
\| \| \| \|
\| * \| \|	Merge commit 'f4c80d70f' into release-v0.99.5	Richard van der Hoff	2019-05-21	5	-6/+89
\| \|\ \ \
\| * \| \| \|	Fix spelling in changelog	Richard van der Hoff	2019-05-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	0.99.5rc1	Richard van der Hoff	2019-05-21	26	-25/+40
\| \| \| \| \|
* \| \| \| \|	Room Statistics (#4338)	Amber Brown	2019-05-21	15	-13/+1306
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #5203 from matrix-org/erikj/aggregate_by_sender	Erik Johnston	2019-05-21	2	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Only count aggregations from distinct senders
\| * \| \| \|	Newsfile	Erik Johnston	2019-05-21	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Only count aggregations from distinct senders	Erik Johnston	2019-05-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As a user isn't allowed to send a single emoji more than once.
* \| \| \| \|	Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactions	Erik Johnston	2019-05-21	4	-5/+87
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Block attempts to annotate the same event twice
\| * \| \| \|	Fix words	Erik Johnston	2019-05-21	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Newsfile	Erik Johnston	2019-05-20	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Block attempts to annotate the same event twice	Erik Johnston	2019-05-20	3	-5/+86
\| \| \| \| \|
* \| \| \| \|	Introduce room v4 which updates event ID format. (#5217)	Richard van der Hoff	2019-05-21	3	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements https://github.com/matrix-org/matrix-doc/pull/2002.
* \| \| \| \|	Exclude soft-failed events from fwd-extremity candidates. (#5146)	Richard van der Hoff	2019-05-21	3	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When considering the candidates to be forward-extremities, we must exclude soft failures. Hopefully fixes #5090.
* \| \| \| \|	Pin eliot to <1.8 on python 3.5.2 (#5218)	Richard van der Hoff	2019-05-21	3	-7/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Pin eliot to <1.8 on python 3.5.2 Fixes https://github.com/matrix-org/synapse/issues/5199 * Add support for 'markers' to python_dependencies * tell xargs not to strip quotes
* \| \| \| \|	Merge pull request #5204 from ↵	Brendan Abolivier	2019-05-21	6	-12/+134
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|	matrix-org/babolivier/account_validity_expiration_date Add startup background job for account validity
\| * \| \|	Doc	Brendan Abolivier	2019-05-21	2	-0/+16
\| \| \| \|
\| * \| \|	Do the select and insert in a single transaction	Brendan Abolivier	2019-05-21	1	-10/+6
\| \| \| \|
\| * \| \|	Changelog	Brendan Abolivier	2019-05-17	1	-0/+1
\| \| \| \|
\| * \| \|	Add startup background job for account validity	Brendan Abolivier	2019-05-17	3	-12/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If account validity is enabled in the server's configuration, this job will run at startup as a background job and will stick an expiration date to any registered account missing one.
* \| \| \|	Fix error handling for rooms whose versions are unknown. (#5219)	Richard van der Hoff	2019-05-21	5	-7/+38
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we remove support for a particular room version, we should behave more gracefully. This should make client requests fail with a 400 rather than a 500, and will ignore individiual PDUs in a federation transaction, rather than the whole transaction.
* \| \|	Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)"	Richard van der Hoff	2019-05-20	2	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ce5bcefc609db40740c692bd53a1ef84ab675e8c. This caused: ``` Traceback (most recent call last): File "/usr/local/lib/python3.7/runpy.py", line 193, in _run_module_as_main "__main__", mod_spec) File "/usr/local/lib/python3.7/runpy.py", line 85, in _run_code exec(code, run_globals) File "/home/synapse/src/synapse/app/client_reader.py", line 32, in <module> from synapse.replication.slave.storage import SlavedProfileStore ImportError: cannot import name 'SlavedProfileStore' from 'synapse.replication.slave.storage' (/home/synapse/src/synapse/replication/slave/storage/__init__.py) error starting synapse.app.client_reader('/home/synapse/config/workers/client_reader.yaml') (exit code: 1); see above for logs ```
* \| \|	Add a test room version which updates event ID format (#5210)	Richard van der Hoff	2019-05-20	3	-3/+34
\| \| \| \| \| \| \| \| \|	Implements MSC1884
* \| \|	Merge pull request #5211 from matrix-org/erikj/fixup_reaction_constants	Erik Johnston	2019-05-20	5	-20/+21
\|\ \ \ \| \| \| \| \| \| \| \|	Rename relation types to match MSC
\| * \| \|	Newsfile	Erik Johnston	2019-05-20	1	-0/+1
\| \| \| \|
\| * \| \|	Rename relation types to match MSC	Erik Johnston	2019-05-20	4	-20/+20
\|/ / /
* \| \|	Merge pull request #5209 from matrix-org/erikj/reactions_base	Erik Johnston	2019-05-20	14	-16/+1439
\|\ \ \ \| \| \| \| \| \| \| \|	Land basic reaction and edit support.
\| * \| \|	Newsfile	Erik Johnston	2019-05-20	2	-1/+1
\| \| \| \|
\| * \| \|	Merge pull request #5207 from matrix-org/erikj/reactions_redactions	Erik Johnston	2019-05-20	3	-12/+125
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Correctly update aggregation counts after redaction
\| \| * \| \|	Fixup comments	Erik Johnston	2019-05-20	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Correctly update aggregation counts after redaction	Erik Johnston	2019-05-20	3	-0/+57
\| \| \| \|/ \| \| \|/\|
\| \| * \|	Make tests use different user for each reaction it sends	Erik Johnston	2019-05-17	1	-12/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As users aren't allowed to react with the same emoji more than once.
\| * \| \|	Merge pull request #5195 from matrix-org/erikj/edits	Erik Johnston	2019-05-20	4	-14/+166
\| \|\\| \| \| \| \| \| \| \| \| \|	Add basic editing support
\| \| * \|	Fixup bsaed on review comments	Erik Johnston	2019-05-17	3	-19/+19
\| \| \| \|
\| \| * \|	Add basic editing support	Erik Johnston	2019-05-16	4	-15/+167
\| \|/ /
\| * \|	Merge pull request #5192 from matrix-org/erikj/relations_aggregations	Erik Johnston	2019-05-16	9	-27/+706
\| \|\ \ \| \| \| \| \| \| \| \|	Add relation aggregation APIs
\| \| * \|	Move parsing of tokens out of storage layer	Erik Johnston	2019-05-16	2	-14/+21
\| \| \| \|
\| \| * \|	Indirect tuple conversion	Erik Johnston	2019-05-16	1	-0/+6
\| \| \| \|
\| \| * \|	Check that event is visible in new APIs	Erik Johnston	2019-05-16	2	-3/+16
\| \| \| \|
\| \| * \|	Fix relations in worker mode	Erik Johnston	2019-05-16	5	-13/+28
\| \| \| \|
\| \| * \|	Add cache to relations	Erik Johnston	2019-05-16	1	-0/+8
\| \| \| \|
\| \| * \|	Add aggregations API	Erik Johnston	2019-05-16	5	-13/+643
\| \| \| \|
\| * \| \|	Merge pull request #5186 from matrix-org/erikj/simple_pagination	Erik Johnston	2019-05-16	9	-0/+479
\| \|\\| \| \| \| \| \| \| \| \| \|	Add simple relations API
\| \| * \|	Actually check for None rather falsey	Erik Johnston	2019-05-15	1	-2/+2
\| \| \| \|
\| \| * \|	Actually implement idempotency	Erik Johnston	2019-05-15	1	-1/+8
\| \| \| \|
\| \| * \|	Newsfile	Erik Johnston	2019-05-15	1	-0/+1
\| \| \| \|
\| \| * \|	Add simple pagination API	Erik Johnston	2019-05-15	3	-0/+160
\| \| \| \|
\| \| * \|	Add simple send_relation API and track in DB	Erik Johnston	2019-05-15	8	-0/+311
\| \|/ /
\| * \|	Merge branch 'erikj/refactor_pagination_bounds' into erikj/reactions_base	Erik Johnston	2019-05-15	5	-63/+122
\| \|\ \
\| * \ \	Merge branch 'erikj/fix_config_ratelimiting' into erikj/test	Erik Johnston	2019-05-14	2	-1/+3
\| \|\ \ \
\| * \ \ \	Merge branch 'erikj/async_serialize_event' into erikj/reactions_rebase	Erik Johnston	2019-05-14	13	-101/+194
\| \|\ \ \ \
* \| \| \| \| \|	Limit UserIds to a length that fits in a state key (#5198)	ReidAnderson	2019-05-20	4	-1/+21
\| \| \| \| \| \|
* \| \| \| \| \|	fix mapping of return values for get_or_register_3pid_guest (#5177)	bytepoets-blo	2019-05-17	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* fix mapping of return values for get_or_register_3pid_guest
* \| \| \| \| \|	Merge pull request #5191 from matrix-org/erikj/refactor_pagination_bounds	Erik Johnston	2019-05-17	2	-61/+134
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make generating SQL bounds for pagination generic
\| * \| \| \| \| \|	Spelling and clarifications	Erik Johnston	2019-05-17	1	-5/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update docstring	Erik Johnston	2019-05-16	1	-1/+12
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Newsfile	Erik Johnston	2019-05-15	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Make generating SQL bounds for pagination generic	Erik Johnston	2019-05-15	1	-61/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow us to reuse the same structure when we paginate e.g. relations
* \| \| \| \| \|	expose SlavedProfileStore to ClientReaderSlavedStore (#5200)	Neil Johnson	2019-05-17	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* expose SlavedProfileStore to ClientReaderSlavedStore
* \| \| \| \| \|	Some vagrant hackery for testing the debs	Richard van der Hoff	2019-05-17	4	-0/+48
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2019-05-17	3	-25/+25
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Stop telling people to install the optional dependencies. (#5197)	Richard van der Hoff	2019-05-17	3	-25/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Stop telling people to install the optional dependencies. They're optional. Also update the postgres docs a bit for clarity(?)
* \| \| \| \| \| \|	Merge pull request #5196 from matrix-org/babolivier/per_room_profiles	Brendan Abolivier	2019-05-17	5	-1/+96
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Add an option to disable per-room profiles
\| * \| \| \| \| \|	Lint	Brendan Abolivier	2019-05-16	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Lint	Brendan Abolivier	2019-05-16	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Changelog + sample config	Brendan Abolivier	2019-05-16	2	-0/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Forgot copyright	Brendan Abolivier	2019-05-16	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add test case	Brendan Abolivier	2019-05-16	1	-1/+67
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add option to disable per-room profiles	Brendan Abolivier	2019-05-16	2	-0/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix image orientation when generating thumbnail (#5039)	PauRE	2019-05-16	4	-1/+46
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only	David Baker	2019-05-16	4	-7/+27
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Re-order registration stages to do msisdn & email auth last
\| * \| \| \| \| \|	Terms might not be the last stage	David Baker	2019-05-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into ↵	David Baker	2019-05-13	2	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dbkr/add_dummy_flow_to_recaptcha_only
\| * \ \ \ \ \ \	Merge remote-tracking branch 'origin/develop' into ↵	David Baker	2019-05-13	4	-31/+47
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dbkr/add_dummy_flow_to_recaptcha_only
\| * \| \| \| \| \| \| \|	And now I realise why the test is failing...	David Baker	2019-05-13	1	-1/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update changelog	David Baker	2019-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Re-order flows so that email auth is done last	David Baker	2019-05-10	1	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's more natural for the user if the bit that takes them away from the registration flow comes last. Adding the dummy stage allows us to do the stages in this order without the ambiguity.
\| * \| \| \| \| \| \| \|	Thanks, automated grammar pedantry.	David Baker	2019-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Comment	David Baker	2019-05-10	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add changelog entry	David Baker	2019-05-10	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add a DUMMY stage to captcha-only registration flow	David Baker	2019-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. vector-im/riot-web#9586
* \| \| \| \| \| \| \| \|	Make /sync attempt to return device updates for both joined and invited ↵	Matthew Hodgson	2019-05-16	2	-19/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	users (#3484)
* \| \| \| \| \| \| \| \|	Merge pull request #5187 from ↵	David Baker	2019-05-16	2	-18/+23
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/dbkr/only_check_threepid_not_in_use_if_actually_registering Only check 3pids not in use when registering
\| * \| \| \| \| \| \| \| \|	Make newsfile clearer	David Baker	2019-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Have I got newsfile for you	David Baker	2019-05-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Only check 3pids not in use when registering	David Baker	2019-05-14	1	-18/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We checked that 3pids were not already in use before we checked if we were going to return the account previously registered in the same UI auth session, in which case the 3pids will definitely be in use. https://github.com/vector-im/riot-web/issues/9586
* \| \| \| \| \| \| \| \| \|	Make all the rate limiting options more consistent (#5181)	Amber Brown	2019-05-15	8	-131/+138
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Drop support for v2_alpha API prefix (#5190)	Richard van der Hoff	2019-05-15	8	-26/+21
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2019-05-15	3	-8/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| / / / / \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix some typos in the changelog v0.99.4 github/release-v0.99.4 release-v0.99.4	Richard van der Hoff	2019-05-15	1	-5/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	0.99.4	Richard van der Hoff	2019-05-15	3	-3/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5183 from matrix-org/erikj/async_serialize_event	Erik Johnston	2019-05-15	13	-101/+194
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow client event serialization to be async
\| * \| \| \| \| \| \| \| \|	Update docstring with correct return type	Erik Johnston	2019-05-15	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-05-14	2	-6/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow client event serialization to be async	Erik Johnston	2019-05-14	12	-95/+187
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array	Erik Johnston	2019-05-15	7	-30/+55
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose DataStore._get_events as get_events_as_list
\| * \| \| \| \| \| \| \|	Update docstring with correct type	Erik Johnston	2019-05-15	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2019-05-14	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Expose DataStore._get_events as get_events_as_list	Erik Johnston	2019-05-14	6	-30/+54
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is in preparation for reaction work which requires it.
* \| \| \| \| \| \|	Merge pull request #5185 from matrix-org/erikj/fix_config_ratelimiting	Erik Johnston	2019-05-15	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	Use correct config option for ratelimiting in tests
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2019-05-14	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use correct config option for ratelimiting in tests	Erik Johnston	2019-05-14	1	-1/+2
\| \|/ / / / /
* / / / / /	comment about user_joined_room	Richard van der Hoff	2019-05-14	1	-0/+1
\|/ / / / /
* \| \| \| \|	Migrate all tests to use the dict-based config format instead of hanging ↵	Amber Brown	2019-05-13	23	-203/+240
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	items off HomeserverConfig (#5171)
* \| \| \| \|	Add ability to blacklist ip ranges for federation traffic (#5043)	Andrew Morgan	2019-05-13	6	-14/+168
\|/ / / /
* \| \| /	0.99.4rc1 v0.99.4rc1	Brendan Abolivier	2019-05-13	75	-78/+83
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #5179 from matrix-org/babolivier/isort	Brendan Abolivier	2019-05-13	2	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|	Fix CI after new release of isort
\| * \|	Fix changelog	Brendan Abolivier	2019-05-13	1	-0/+0
\| \| \|
\| * \|	Changelog	Brendan Abolivier	2019-05-13	1	-0/+1
\| \| \|
\| * \|	Fix CI after new release of isort	Brendan Abolivier	2019-05-13	1	-1/+0
\|/ /
* \|	Merge branch 'master' into develop	Richard van der Hoff	2019-05-10	0	-0/+0
\|\ \
\| * \|	fix sample config	Richard van der Hoff	2019-05-10	1	-1/+1
\| \| \|
* \| \|	URL preview blacklisting fixes (#5155)	Andrew Morgan	2019-05-10	4	-31/+47
\| \|/ \|/\| \| \|	Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases.
* \|	Revert 085ae346ace418e0fc043ac5f568f85ebf80038e	David Baker	2019-05-10	1	-1/+1
\| \| \| \| \| \| \| \|	Accidentally went straight to develop
* \|	Add a DUMMY stage to captcha-only registration flow	David Baker	2019-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. https://github.com/vector-im/riot-web/issues/9586
* \|	Make Prometheus snippet less confusing on the metrics collection doc (#4288)	Gergely Polonkai	2019-05-10	1	-1/+4
\| \| \| \| \| \|	Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
* \|	Set syslog identifiers in systemd units (#5023)	Christoph Müller	2019-05-10	6	-1/+14
\| \|
* \|	Run Black on the tests again (#5170)	Amber Brown	2019-05-10	54	-1169/+829
\| \|
* \|	Add AllowEncodedSlashes to apache (#5068)	colonelkrud	2019-05-09	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add AllowEncodedSlashes to apache Add `AllowEncodedSlashes On` to apache config to support encoding for v3 rooms. "The AllowEncodedSlashes setting is not inherited by virtual hosts, and virtual hosts are used in many default Apache configurations, such as the one in Ubuntu. The workaround is to add the AllowEncodedSlashes setting inside a <VirtualHost> container (/etc/apache2/sites-available/default in Ubuntu)." Source: https://stackoverflow.com/questions/4390436/need-to-allow-encoded-slashes-on-apache * change allowencodedslashes to nodecode
* \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2019-05-09	1	-16/+5
\|\\|
\| *	remove instructions for jessie installation (#5164)	Richard van der Hoff	2019-05-09	1	-16/+5
\| \| \| \| \| \|	We don't ship jessie packages, so these were a bit misleading.
* \|	Run `black` on per_destination_queue	Richard van der Hoff	2019-05-09	1	-35/+39
\| \| \| \| \| \| \| \|	... mostly to fix pep8 fails
* \|	Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)	Quentin Dufour	2019-05-09	3	-27/+32
\| \| \| \| \| \|	Fixes #3951.
* \|	Fix bogus imports in tests (#5154)	Brendan Abolivier	2019-05-08	4	-5/+7
\| \|
* \|	add options to require an access_token to GET /profile and /publicRooms on ↵	Matthew Hodgson	2019-05-08	9	-13/+252
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit.
* \|	Merge pull request #5037 from matrix-org/erikj/limit_inflight_dns	Erik Johnston	2019-05-08	2	-1/+83
\|\ \ \| \| \| \| \| \|	Limit in flight DNS requests
\| * \|	Newsfile	Erik Johnston	2019-04-09	1	-0/+1
\| \| \|
\| * \|	Limit in flight DNS requests	Erik Johnston	2019-04-09	1	-1/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to work around a bug in twisted where a large number of concurrent DNS requests cause it to tight loop forever. c.f. https://twistedmatrix.com/trac/ticket/9620#ticket
* \| \|	Do checks on aliases for incoming m.room.aliases events (#5128)	Brendan Abolivier	2019-05-08	7	-8/+225
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended.
* \| \|	Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite	Erik Johnston	2019-05-07	2	-0/+12
\|\ \ \ \| \| \| \| \| \| \| \|	Ratelimit 3pid invites
\| * \| \|	Rate limit early	Erik Johnston	2019-05-02	1	-2/+3
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2019-04-26	108	-6218/+1842
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/ratelimit_3pid_invite
\| * \| \| \|	Newsfile	Erik Johnston	2019-04-26	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Ratelimit 3pid invites	Erik Johnston	2019-04-26	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We do ratelimit sending the 3PID invite events, but that happens after spamming the identity server.
* \| \| \| \|	Remove the requirement to authenticate for /admin/server_version. (#5122)	Richard van der Hoff	2019-05-07	5	-38/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This endpoint isn't much use for its intended purpose if you first need to get yourself an admin's auth token. I've restricted it to the `/_synapse/admin` path to make it a bit easier to lock down for those concerned about exposing this information. I don't imagine anyone is using it in anger currently.
* \| \| \| \|	Fix spelling in server notices admin API docs (#5142)	Travis Ralston	2019-05-06	2	-1/+2
\| \| \| \| \|
* \| \| \| \|	Fix sample config	Richard van der Hoff	2019-05-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... after it got broken in 1565ebec2c.
* \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2019-05-03	9	-19/+84
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge tag 'v0.99.3.2'	Richard van der Hoff	2019-05-03	9	-19/+84
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse 0.99.3.2 (2019-05-03) ============================= Internal Changes ---------------- - Ensure that we have `urllib3` <1.25, to resolve incompatibility with `requests`. ([\#5135](https://github.com/matrix-org/synapse/issues/5135))
\| \| * \| \| \|	0.99.3.2 v0.99.3.2 github/release-v0.99.3.2 release-v0.99.3.2	Richard van der Hoff	2019-05-03	4	-2/+16
\| \| \| \| \| \|
\| \| * \| \| \|	include disco in deb build target list	Richard van der Hoff	2019-05-03	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #5135 from matrix-org/rav/build_fixes	Richard van der Hoff	2019-05-03	3	-1/+11
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build fixes
\| \| \| * \| \| \|	changelog	Richard van der Hoff	2019-05-03	1	-0/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Debian: we now need libpq-dev.	Richard van der Hoff	2019-05-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	psycopg 2.8 is now out, which means that the C library gets built from source, so we now need libpq-dev when building. Turns out the need for this package is already documented in docs/postgres.rst.
\| \| \| * \| \| \|	pin urllib3 to <1.25	Richard van der Hoff	2019-05-03	1	-0/+8
\| \| \|/ / / /
\| \| * \| \| \|	changelog tweaks v0.99.3.1 github/release-v0.99.3.1 release-v0.99.3.1	Richard van der Hoff	2019-05-03	1	-2/+4
\| \| \| \| \| \|