7f1a6a4ea5
Merge pull request #4399 from andrewshadura/update-python-deps
...
Update Dependencies
2019-01-16 13:37:47 +00:00
3b31a54a6e
Add a changelog entry
...
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
2019-01-16 10:54:43 +01:00
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
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
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
9ec56d6935
ALL_USER_TYPES should be a tuple
2019-01-15 14:38:15 +00:00
4a4d2e17bc
Add /v2/invite federation API
2019-01-15 13:22:44 +00:00
1a8f4139a5
Newsfile
2019-01-15 11:21:52 +00:00
bb63e7ca4f
Add groundwork for new versions of federation APIs
2019-01-15 11:14:34 +00:00
7e41545e8b
Merge branch 'release-v0.34.1.1' into develop
2019-01-12 13:30:30 +00:00
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
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
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
a35c66a00b
Remove duplicates in the user_ips table and add an index ( #4370 )
2019-01-12 06:21:50 +11:00
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
522dada206
Merge remote-tracking branch 'origin/master' into develop
2019-01-11 02:22:48 +11:00
ea00f18135
Merge Synapse v0.34.1.1
2019-01-11 02:21:54 +11:00
c0dba73aa0
changelog, for debian
2019-01-11 02:20:29 +11:00
8c818af38e
Merge pull request #4342 from aaronraimist/new-virtualenv
...
Update README to use new virtualenv (#4328 )
2019-01-10 14:59:33 +00:00
5c792ee5c3
changelog
2019-01-11 01:59:10 +11:00
6dc06c3775
version
2019-01-11 01:56:37 +11:00
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
de80e979c9
changelog
2019-01-10 14:26:01 +00:00
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
ba41aeed6a
Revert "Fix macaroon_secret_key fallback logic"
...
This is already fixed in 0.34.1, by 59f93bbefc522c55e
2019-01-10 14:09:26 +00:00
4f24452ead
changelog
2019-01-10 14:00:23 +00:00
aa70d24125
Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34
2019-01-10 12:58:33 +00:00
efc522c55e
Fix macaroon_secret_key fallback logic
2019-01-10 12:57:27 +00:00
566947ff34
Skip macaroon check for access tokens in the db
2019-01-10 12:57:21 +00:00
353f2407b7
Fix fallback to signing key for macaroon-secret-key
2019-01-10 12:42:56 +00:00
8d4b4e781f
Merge branch 'master' into develop
2019-01-09 16:52:08 +00:00
95fca1c7e9
fix docker build to install optional deps
2019-01-09 16:37:51 +00:00
58fe88c47e
Merge branch 'master' into develop
2019-01-09 16:02:05 +00:00
2394e832a8
debian: Remove Breaks: matrix-synapse-ldap3
2019-01-09 15:35:11 +00:00
d566e6b17a
Merge branch 'master' into develop
2019-01-09 15:00:46 +00:00
998f5225c1
0.34.1
2019-01-09 14:53:54 +00:00
55c3e853c5
Merge pull request #4368 from matrix-org/erikj/better_errors
...
Fixup docstrings for matrixfederationclient
2019-01-09 11:39:28 +00:00
484867d35d
Merge branch 'develop' into release-v0.34.1
2019-01-09 11:38:13 +00:00
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
0dce21ba77
Newsfile
2019-01-09 09:27:03 +00:00
34ea14139d
Fixup docstrings for matrixfederationclient
2019-01-09 09:25:59 +00:00
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
d91b99abe0
Newsfile
2019-01-08 14:24:05 +00:00
d422570e9b
Use RequestSendFailed when fail to parse content type headers
2019-01-08 14:22:18 +00:00
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
83c50bf752
Newsfile
2019-01-08 12:28:35 +00:00
1371d5b798
Don't log stack traces for HTTP error responses
2019-01-08 12:28:30 +00:00
32172f2297
clean up changelog
2019-01-08 11:26:11 +00:00
ba85786d71
0.34.1rc1
2019-01-08 11:15:34 +00:00
bc1a4b5576
changelog
2019-01-08 11:14:59 +00:00
Erik Johnston