12869 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard van der Hoff	de6888e7ce	Remove redundant WrappedConnection (#4409) ... * Remove redundant WrappedConnection The matrix federation client uses an HTTP connection pool, which times out its idle HTTP connections, so there is no need for any of this business.	2019-01-18 23:07:38 +11:00
Richard van der Hoff	676cf2ee26	Fix incorrect logcontexts after a Deferred was cancelled (#4407)	2019-01-17 14:00:23 +00:00
Richard van der Hoff	9feb5d0b71	sign_request -> build_auth_headers (#4408) ... Just got very confused about the fact that the headers are only an output, not an input.	2019-01-17 12:40:09 +00:00
Richard van der Hoff	3982a6ee07	Changing macaroon_secret_key no longer logs you out (#4387)	2019-01-16 23:14:41 +00:00
Richard van der Hoff	05e1296649	don't store more remote device lists if they have more than 1K devices (#4397)	2019-01-16 23:14:11 +00:00
Erik Johnston	7f1a6a4ea5	Merge pull request #4399 from andrewshadura/update-python-deps ... Update Dependencies	2019-01-16 13:37:47 +00:00
Andrej Shadura	3b31a54a6e	Add a changelog entry ... Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>	2019-01-16 10:54:43 +01:00
Andrej Shadura	64cf6788d9	Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynacl ... Since 0.13.0, pymacaroons works correctly with pynacl, so there isn’t any more reason to depend on an outdated pynacl fork. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>	2019-01-16 10:54:41 +01:00
Andrej Shadura	fab948120f	Use msgpack instead of msgpack-python ... The package msgpack-python has been deprecated. Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>	2019-01-16 10:53:49 +01:00
Erik Johnston	aa955f2d15	Merge pull request #4392 from matrix-org/neilj/fix_user_type_typo ... ALL_USER_TYPES should be a tuple	2019-01-15 14:56:52 +00:00
Neil Johnson	9ec56d6935	ALL_USER_TYPES should be a tuple	2019-01-15 14:38:15 +00:00
Richard van der Hoff	7e41545e8b	Merge branch 'release-v0.34.1.1' into develop	2019-01-12 13:30:30 +00:00
Richard van der Hoff	4fd051f9c3	moar plusses! ... turns out that 0.34.1.1+1 comes before 0.34.1.1+bionic (etc). The version may only contain "~ 0-9 A-Z a-z + - ." (sorting in that order). Option 1: replace "+" with something that sorts after +. Options are "-" (but dpkg-source complains about that) or "." (but that would mean we couldn't distinguish packaging-only changes from real changes). Option 2: stick with + and just find something that sorts after 'xenial'. The only options there are "-", "." (same problems as before), "z", and "+". Hence, ++1. Sorry.	2019-01-12 13:08:32 +00:00
Richard van der Hoff	b5b868d41e	Rewrite build_debian_packages ... Rewrite this in python so that it can be run in parallel.	2019-01-12 12:40:58 +00:00
Richard van der Hoff	34b25dcc8e	Silence travis-ci build warnings by removing non-functional python3.6 (#4377) ... * Remove non-functional python3.6 in travis env * changelog	2019-01-12 06:22:56 +11:00
Amber Brown	a35c66a00b	Remove duplicates in the user_ips table and add an index (#4370)	2019-01-12 06:21:50 +11:00
Richard van der Hoff	91fa34b3fa	s/Breaks/Conflicts/ in debian/control ... Otherwise people can't upgrade from matrix-synapse without removing it first	2019-01-11 17:05:45 +00:00
Amber Brown	522dada206	Merge remote-tracking branch 'origin/master' into develop	2019-01-11 02:22:48 +11:00
Amber Brown	ea00f18135	Merge Synapse v0.34.1.1	2019-01-11 02:21:54 +11:00
Amber Brown	c0dba73aa0	changelog, for debian	2019-01-11 02:20:29 +11:00
Richard van der Hoff	8c818af38e	Merge pull request #4342 from aaronraimist/new-virtualenv ... Update README to use new virtualenv (#4328)	2019-01-10 14:59:33 +00:00
Amber Brown	5c792ee5c3	changelog	2019-01-11 01:59:10 +11:00
Amber Brown	6dc06c3775	version	2019-01-11 01:56:37 +11:00
Amber Brown	3933ce9f13	Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1 ... Fix spontaneous logout	2019-01-11 01:48:53 +11:00
Richard van der Hoff	de80e979c9	changelog	2019-01-10 14:26:01 +00:00
Richard van der Hoff	e0910d0145	Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 ... Fixes #4371	2019-01-10 14:12:50 +00:00
Richard van der Hoff	ba41aeed6a	Revert "Fix macaroon_secret_key fallback logic" ... This is already fixed in 0.34.1, by 59f93bb This reverts commit efc522c55e.	2019-01-10 14:09:26 +00:00
Richard van der Hoff	4f24452ead	changelog	2019-01-10 14:00:23 +00:00
Richard van der Hoff	aa70d24125	Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34	2019-01-10 12:58:33 +00:00
Richard van der Hoff	efc522c55e	Fix macaroon_secret_key fallback logic	2019-01-10 12:57:27 +00:00
Richard van der Hoff	566947ff34	Skip macaroon check for access tokens in the db	2019-01-10 12:57:21 +00:00
Richard van der Hoff	353f2407b7	Fix fallback to signing key for macaroon-secret-key	2019-01-10 12:42:56 +00:00
Richard van der Hoff	8d4b4e781f	Merge branch 'master' into develop	2019-01-09 16:52:08 +00:00
Richard van der Hoff	95fca1c7e9	fix docker build to install optional deps	2019-01-09 16:37:51 +00:00
Richard van der Hoff	58fe88c47e	Merge branch 'master' into develop	2019-01-09 16:02:05 +00:00
Richard van der Hoff	2394e832a8	debian: Remove Breaks: matrix-synapse-ldap3	2019-01-09 15:35:11 +00:00
Richard van der Hoff	d566e6b17a	Merge branch 'master' into develop	2019-01-09 15:00:46 +00:00
Richard van der Hoff	998f5225c1	0.34.1	2019-01-09 14:53:54 +00:00
Erik Johnston	55c3e853c5	Merge pull request #4368 from matrix-org/erikj/better_errors ... Fixup docstrings for matrixfederationclient	2019-01-09 11:39:28 +00:00
Erik Johnston	484867d35d	Merge branch 'develop' into release-v0.34.1	2019-01-09 11:38:13 +00:00
Amber Brown	7960c26fda	Fix adding new rows instead of updating them if one of the key values is a NULL in upserts. (#4369)	2019-01-09 22:26:25 +11:00
Erik Johnston	0dce21ba77	Newsfile	2019-01-09 09:27:03 +00:00
Erik Johnston	34ea14139d	Fixup docstrings for matrixfederationclient	2019-01-09 09:25:59 +00:00
Erik Johnston	d1d81d0651	Merge pull request #4362 from matrix-org/erikj/better_errors ... Use RequestSendFailed when fail to parse content type headers	2019-01-09 09:08:35 +00:00
Erik Johnston	d91b99abe0	Newsfile	2019-01-08 14:24:05 +00:00
Erik Johnston	d422570e9b	Use RequestSendFailed when fail to parse content type headers	2019-01-08 14:22:18 +00:00
Erik Johnston	c4530b97b2	Merge pull request #4361 from matrix-org/erikj/better_errors ... Don't log stack traces for HTTP error responses	2019-01-08 14:19:00 +00:00
Erik Johnston	83c50bf752	Newsfile	2019-01-08 12:28:35 +00:00
Erik Johnston	1371d5b798	Don't log stack traces for HTTP error responses	2019-01-08 12:28:30 +00:00
Richard van der Hoff	32172f2297	clean up changelog	2019-01-08 11:26:11 +00:00