1756 commits

Author	SHA1	Message	Date
Hubert Chathi	e9d587d0d8	Apply suggestions from code review ... Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>	2019-08-31 15:46:49 -07:00
Hubert Chathi	0355a75285	Merge branch 'develop' into uhoreg/e2e_backup_hash	2019-08-15 20:00:37 -07:00
Andrew Morgan	b13cac896d	Fix up password reset template config names (#5863) ... Fixes #5833 The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.	2019-08-15 16:27:11 +01:00
Michael Telatynski	baee288fb4	Don't create broken room when power_level_content_override.users does not contain creator_id. (#5633)	2019-08-15 09:45:57 +01:00
Hubert Chathi	049a93901c	add changelog	2019-08-14 22:38:57 -07:00
Erik Johnston	09f6152a11	Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookup ... Retry well-known lookup before expiry.	2019-08-14 09:53:33 +01:00
Brendan Abolivier	f70d0a1dd9	1.3.0rc1	2019-08-13 18:20:09 +01:00
Amber H. Brown	28bce1ac7c	changelog	2019-08-14 02:08:24 +10:00
Erik Johnston	aedfec3ad7	Newsfile	2019-08-13 16:20:38 +01:00
Erik Johnston	af187805b3	Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop ... Handle pusher being deleted during processing.	2019-08-13 14:08:29 +01:00
Amber Brown	0b6fbb28a8	Don't load the media repo when configured to use an external media repo (#5754)	2019-08-13 21:49:28 +10:00
Erik Johnston	e9906b0772	Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known ... Add a lower bound to well-known TTL.	2019-08-13 12:41:16 +01:00
Erik Johnston	2546f32b90	Merge pull request #5826 from matrix-org/erikj/reduce_event_pauses ... Don't unnecessarily block notifying of new events.	2019-08-13 09:36:25 +01:00
Erik Johnston	9d9cf3583b	Merge pull request #5843 from matrix-org/erikj/workers_hist_vis ... Whitelist history visbility sytests for worker mode	2019-08-12 18:02:19 +01:00
Erik Johnston	2bec3a4953	Merge pull request #5839 from tcitworld/fix-purge-remote-media-script ... Fix curl command typo in purge_remote_media.sh	2019-08-12 14:51:27 +01:00
Erik Johnston	3de6cc245f	Changelogs should end in '.' or '!'	2019-08-12 14:16:42 +01:00
Erik Johnston	156a461cbd	Newsfile	2019-08-12 13:57:52 +01:00
Richard van der Hoff	fb86217553	Merge pull request #5788 from matrix-org/rav/metaredactions ... Fix handling of redactions of redactions	2019-08-12 12:25:19 +01:00
Erik Johnston	41546f946e	Newsfile	2019-08-12 09:56:58 +01:00
Thomas Citharel	a7f0161276	Fix curl command typo in purge_remote_media.sh ... Was verbose option instead of -X, command didn't work Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-08-09 18:36:12 +02:00
Erik Johnston	d1b5b055be	Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_sync ... Handle TimelineBatch being limited and empty.	2019-08-06 15:39:44 +01:00
Andrew Morgan	edeae53221	Return 404 instead of 403 when retrieving an event without perms (#5798) ... Part of fixing matrix-org/sytest#652 Sytest PR: matrix-org/sytest#667	2019-08-06 13:33:55 +01:00
Erik Johnston	c32d359094	Newsfile	2019-08-06 13:33:42 +01:00
Erik Johnston	977fa4a717	Newsfile	2019-08-06 13:00:45 +01:00
Brendan Abolivier	8ed9e63432	Account validity: allow defining HTML templates to serve the us… (#5807) ... Account validity: allow defining HTML templates to serve the user on account renewal attempt	2019-08-01 16:09:25 +02:00
Erik Johnston	d55bc4a8bf	Merge pull request #5810 from matrix-org/erikj/no_server_reachable ... Return 502 not 500 when failing to reach any remote server.	2019-08-01 14:19:39 +01:00
Andrew Morgan	5d018d23f0	Have ClientReaderSlavedStore inherit RegistrationStore (#5806) ... Fixes #5803	2019-08-01 13:54:56 +01:00
Erik Johnston	93fd3cbc7a	Newsfile	2019-08-01 13:48:52 +01:00
Erik Johnston	3c076c79c5	Merge pull request #5808 from matrix-org/erikj/parse_decode_error ... Handle incorrectly encoded query params correctly	2019-08-01 13:48:10 +01:00
Erik Johnston	55a0c98d16	Merge pull request #5805 from matrix-org/erikj/validate_state ... Validate well known state events are state events.	2019-08-01 13:45:48 +01:00
Erik Johnston	0b36decfb6	Merge pull request #5801 from matrix-org/erikj/recursive_tombstone ... Don't allow clients to send tombstones that reference the same room	2019-08-01 13:45:35 +01:00
Erik Johnston	312cc48e2b	Newsfile	2019-08-01 13:45:09 +01:00
Erik Johnston	da378af445	Newsfile	2019-08-01 13:24:00 +01:00
Erik Johnston	76a58fdcce	Fix spelling. ... Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2019-08-01 13:17:55 +01:00
Erik Johnston	58af30a6c7	Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_room ... Deny redaction of events in a different room.	2019-08-01 13:14:46 +01:00
Erik Johnston	0f632f3a57	Merge pull request #5790 from matrix-org/erikj/groups_request_errors ... Handle RequestSendFailed exception correctly in more places.	2019-08-01 13:14:08 +01:00
Brendan Abolivier	f4a30d286f	Changelog	2019-08-01 12:08:06 +02:00
Erik Johnston	e5a0224837	Newsfile	2019-07-31 16:39:42 +01:00
Erik Johnston	c5288e9984	Newsfile	2019-07-31 16:32:03 +01:00
Erik Johnston	0eefb76fa1	Newsfile	2019-07-31 16:13:57 +01:00
Erik Johnston	02735e140f	Newsfile	2019-07-31 15:53:52 +01:00
Andrew Morgan	72167fb394	Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) ... This is intended as an amendment to #5674 as using M_UNKNOWN as the errcode makes it hard for clients to differentiate between an invalid password and a deactivated user (the problem we were trying to solve in the first place). M_UNKNOWN was originally chosen as it was presumed than an MSC would have to be carried out to add a new code, but as Synapse often is the testing bed for new MSC implementations, it makes sense to try it out first in the wild and then add it into the spec if it is successful. Thus this PR return a new M_USER_DEACTIVATED code when a deactivated user attempts to login.	2019-07-31 15:19:06 +01:00
Erik Johnston	8fde611a8c	Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known ... Share SSL options for well-known requests	2019-07-31 11:40:02 +01:00
Amber Brown	8f15832950	Remove DelayedCall debugging from test runs (#5787)	2019-07-31 20:39:22 +10:00
Erik Johnston	fe2f2fc530	Newsfile	2019-07-31 10:59:39 +01:00
Erik Johnston	3b7a35a59a	Newsfile	2019-07-31 10:39:24 +01:00
Erik Johnston	4037d3220a	Newsfile	2019-07-30 16:43:59 +01:00
Erik Johnston	958d69f300	Newsfile	2019-07-30 14:53:52 +01:00
Erik Johnston	f92d05e254	Newsfile	2019-07-30 13:43:53 +01:00
Erik Johnston	e23ab7f41a	Newsfile	2019-07-30 13:10:00 +01:00