8644 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	70caf49914	Do the same for get_json	2017-04-21 16:09:03 +01:00
David Baker	a1595cec78	Don't error for 3xx responses	2017-04-21 11:51:17 +01:00
David Baker	2e165295b7	Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagate_error	2017-04-21 11:35:52 +01:00
David Baker	a90a0f5c8a	Propagate errors sensibly from proxied IS requests ... When we're proxying Matrix endpoints, parse out Matrix error responses and turn them into SynapseErrors so they can be propagated sensibly upstream.	2017-04-21 11:32:48 +01:00
Luke Barnard	3fb8784c92	m.read_marker -> m.fully_read (#2128) ... Also: - change the REST endpoint to have a "S" on the end (so it's now /read_markers) - change the content of the m.read_up_to event to have the key "event_id" instead of "marker".	2017-04-18 17:46:15 +01:00
Matthew Hodgson	c02b6a37d6	Merge pull request #2132 from feld/patch-1 ... Update README.rst	2017-04-17 16:18:34 +01:00
Mark Felder	814fb032eb	Update README.rst ... The FreeBSD port has been moved to the net-im category	2017-04-17 08:26:50 -05:00
Luke Barnard	78f0ddbfad	Merge pull request #2120 from matrix-org/luke/read-markers ... Implement Read Marker API	2017-04-13 14:21:31 +01:00
Luke Barnard	6a70647d45	Correct logic in is_event_after	2017-04-13 13:46:17 +01:00
Luke Barnard	b9557064bf	Simplify is_event_after logic	2017-04-12 14:36:20 +01:00
Luke Barnard	cf6121e3da	More null-guard changes	2017-04-12 14:02:03 +01:00
Erik Johnston	247c736b9b	Merge pull request #2115 from matrix-org/erikj/dedupe_federation_repl ... Reduce federation replication traffic	2017-04-12 11:07:13 +01:00
Paul Evans	8fbc0d29ee	Merge pull request #2121 from matrix-org/paul/sent-transactions-metric ... Add a counter metric for successfully-sent transactions	2017-04-12 11:04:31 +01:00
Erik Johnston	c06c00190f	Merge pull request #2116 from matrix-org/erikj/dedupe_federation_repl2 ... Dedupe KeyedEdu and Devices federation repl traffic	2017-04-12 10:57:24 +01:00
Luke Barnard	c0aba0a23e	Remove Unused ref to hs	2017-04-12 10:52:11 +01:00
Luke Barnard	b9676a75f6	Move a space	2017-04-12 10:51:17 +01:00
Luke Barnard	69a18514e9	Only notify user, not entire room	2017-04-12 10:50:37 +01:00
Luke Barnard	122cd52ce4	Remove comment, simplify null-guard	2017-04-12 10:48:32 +01:00
Erik Johnston	26ae5178a4	Add some comments	2017-04-12 10:36:29 +01:00
Erik Johnston	bf9060156a	Merge pull request #2117 from matrix-org/erikj/remove_http_replication ... Remove HTTP replication APIs	2017-04-12 10:21:42 +01:00
Erik Johnston	82301b6c29	Remove last reference to worker_replication_url	2017-04-12 10:21:02 +01:00
Erik Johnston	1745069543	Comment	2017-04-12 10:17:10 +01:00
Erik Johnston	c7ddb5ef7a	Reuse get_interested_parties	2017-04-12 10:16:26 +01:00
Erik Johnston	7b41013102	Merge pull request #2118 from matrix-org/erikj/no_devices ... Fix getting latest device IP for user with no devices	2017-04-12 10:14:32 +01:00
Luke Barnard	77fb2b72ae	Handle no previous RM	2017-04-12 09:47:29 +01:00
Luke Barnard	7f94709066	travis flake8..	2017-04-11 18:35:45 +01:00
Luke Barnard	867822fa1e	flake8	2017-04-11 17:36:04 +01:00
Luke Barnard	73880268ef	Refactor event ordering check to events store	2017-04-11 17:34:09 +01:00
Luke Barnard	131485ef66	Copyright	2017-04-11 17:33:51 +01:00
Paul "LeoNerd" Evans	11dbceb761	Add a counter metric for successfully-sent transactions	2017-04-11 17:16:12 +01:00
Luke Barnard	0127423027	flake8	2017-04-11 17:07:07 +01:00
Erik Johnston	85657eedf8	Bail on where clause instead	2017-04-11 16:24:31 +01:00
Erik Johnston	b48045a8f5	Don't bother with outer check for now	2017-04-11 16:23:24 +01:00
Erik Johnston	6f65e2f90c	Update replication docs	2017-04-11 16:21:12 +01:00
Erik Johnston	323634bf8b	Update workers docs	2017-04-11 16:19:52 +01:00
Erik Johnston	9c712a366f	Move get_presence_list_* to SlaveStore	2017-04-11 16:07:33 +01:00
Erik Johnston	a8c8e4efd4	Comment	2017-04-11 15:35:49 +01:00
Erik Johnston	414522aed5	Move get_interested_parties	2017-04-11 15:33:26 +01:00
Erik Johnston	2be8a281d2	Comments	2017-04-11 15:28:24 +01:00
Erik Johnston	6308ac45b0	Move get_interested_remotes back to presence handler	2017-04-11 15:19:26 +01:00
Erik Johnston	b9b72bc6e2	Comments	2017-04-11 15:15:34 +01:00
Luke Barnard	d892079844	Finish implementing RM endpoint ... - This change causes a 405 to be sent if "m.read_marker" is set via /account_data - This also fixes-up the RM endpoint so that it actually Works.	2017-04-11 15:01:39 +01:00
lukebarnard	e263c26690	Initial commit of RM server-side impl ... (See https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit#heading=h.lndohpg8at5u)	2017-04-11 11:55:30 +01:00
Erik Johnston	f3cf3ff8b6	Merge branch 'master' of github.com:matrix-org/synapse into develop	2017-04-11 11:13:32 +01:00
Erik Johnston	4902db1fc9	Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse	2017-04-11 11:12:37 +01:00
Erik Johnston	d563b8d944	Bump changelog	2017-04-11 11:12:13 +01:00
Erik Johnston	85a0d6c7ab	Remove test of replication resource	2017-04-11 10:59:27 +01:00
Erik Johnston	34840cdcef	Fix getting latest device IP for user with no devices	2017-04-11 09:56:54 +01:00
Erik Johnston	28a4649785	Remove HTTP replication APIs	2017-04-11 09:52:11 +01:00
Matthew Hodgson	7c551ec445	trust a hypothetical future riot.im IS	2017-04-10 17:58:36 +01:00