Richard van der Hoff
|
7e41545e8b
Merge branch 'release-v0.34.1.1' into develop
|
5 years ago |
Richard van der Hoff
|
4fd051f9c3
moar plusses!
|
5 years ago |
Richard van der Hoff
|
b5b868d41e
Rewrite build_debian_packages
|
5 years ago |
Richard van der Hoff
|
34b25dcc8e
Silence travis-ci build warnings by removing non-functional python3.6 (#4377)
|
5 years ago |
Amber Brown
|
a35c66a00b
Remove duplicates in the user_ips table and add an index (#4370)
|
5 years ago |
Richard van der Hoff
|
91fa34b3fa
s/Breaks/Conflicts/ in debian/control
|
5 years ago |
Amber Brown
|
522dada206
Merge remote-tracking branch 'origin/master' into develop
|
5 years ago |
Amber Brown
|
ea00f18135
Merge Synapse v0.34.1.1
|
5 years ago |
Amber Brown
|
c0dba73aa0
changelog, for debian
|
5 years ago |
Richard van der Hoff
|
8c818af38e
Merge pull request #4342 from aaronraimist/new-virtualenv
|
5 years ago |
Amber Brown
|
5c792ee5c3
changelog
|
5 years ago |
Amber Brown
|
6dc06c3775
version
|
5 years ago |
Amber Brown
|
3933ce9f13
Merge pull request #4374 from matrix-org/rav/macaroon_key_fix_0.34.1
|
5 years ago |
Richard van der Hoff
|
de80e979c9
changelog
|
5 years ago |
Richard van der Hoff
|
e0910d0145
Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1
|
5 years ago |
Richard van der Hoff
|
ba41aeed6a
Revert "Fix macaroon_secret_key fallback logic"
|
5 years ago |
Richard van der Hoff
|
4f24452ead
changelog
|
5 years ago |
Richard van der Hoff
|
aa70d24125
Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34
|
5 years ago |
Richard van der Hoff
|
efc522c55e
Fix macaroon_secret_key fallback logic
|
5 years ago |
Richard van der Hoff
|
566947ff34
Skip macaroon check for access tokens in the db
|
5 years ago |
Richard van der Hoff
|
353f2407b7
Fix fallback to signing key for macaroon-secret-key
|
5 years ago |
Richard van der Hoff
|
8d4b4e781f
Merge branch 'master' into develop
|
5 years ago |
Richard van der Hoff
|
95fca1c7e9
fix docker build to install optional deps
|
5 years ago |
Richard van der Hoff
|
58fe88c47e
Merge branch 'master' into develop
|
5 years ago |
Richard van der Hoff
|
2394e832a8
debian: Remove Breaks: matrix-synapse-ldap3
|
5 years ago |
Richard van der Hoff
|
d566e6b17a
Merge branch 'master' into develop
|
5 years ago |
Richard van der Hoff
|
998f5225c1
0.34.1
|
5 years ago |
Erik Johnston
|
55c3e853c5
Merge pull request #4368 from matrix-org/erikj/better_errors
|
5 years ago |
Erik Johnston
|
484867d35d
Merge branch 'develop' into release-v0.34.1
|
5 years ago |
Amber Brown
|
7960c26fda
Fix adding new rows instead of updating them if one of the key values is a NULL in upserts. (#4369)
|
5 years ago |