 Brendan Abolivier
|
f06bc8e068
Merge branch 'master' into dinsic
|
3 gadi atpakaļ |
 Patrick Cloke
|
72133eab9a
Bump the version of signedjson to 1.1.1. (#334)
|
3 gadi atpakaļ |
|
Brendan Abolivier
|
0eff7c2944
Merge branch 'dinsic' into babolivier/dinsic-merge-tmp
|
4 gadi atpakaļ |
|
Brendan Abolivier
|
a5c8802b90
Fix support of JSON body in /store-invite requests
|
5 gadi atpakaļ |
 Andrew Morgan
|
5420789af3
Add 60s timeout to remote peer pushes
|
4 gadi atpakaļ |
|
Brendan Abolivier
|
33a2f44e52
Merge commit '48c4c0a' into babolivier/dinsic-merge-tmp
|
4 gadi atpakaļ |
|
Brendan Abolivier
|
4ae8682328
Merge commit 'dcda2dc' into babolivier/dinsic-merge-tmp
|
4 gadi atpakaļ |
|
Brendan Abolivier
|
31ec28675b
Merge commit '60260dc' into babolivier/dinsic-merge-tmp
|
4 gadi atpakaļ |
|
Brendan Abolivier
|
0373e13e29
Merge commit '3ce83d5' into babolivier/dinsic-merge-tmp
|
4 gadi atpakaļ |
|
Andrew Morgan
|
5c39549c23
Add unit tests
|
4 gadi atpakaļ |
 David Baker
|
81c33cd781
Add pyyaml
|
5 gadi atpakaļ |
|
Brendan Abolivier
|
3f787193c0
Fix support of JSON body in /store-invite requests
|
5 gadi atpakaļ |
 Richard van der Hoff
|
3ce83d5ff3
Well-Known support (#118)
|
5 gadi atpakaļ |
|
Andrew Morgan
|
79e712382c
Address comments
|
5 gadi atpakaļ |
|
Andrew Morgan
|
ae58da59a6
And another
|
5 gadi atpakaļ |
|
Andrew Morgan
|
767f34e7d8
Remove erroneous dependency
|
5 gadi atpakaļ |
|
Andrew Morgan
|
21514b7175
Remove conflicts
|
5 gadi atpakaļ |
|
Andrew Morgan
|
b317987486
Merge branch 'dinsic' into anoa/dinsic_replicate_3pid_invites
|
5 gadi atpakaļ |
|
Andrew Morgan
|
12ec8d8ada
Merge branch 'master' into anoa/dinsic_replicate_3pid_invites
|
5 gadi atpakaļ |
|
Richard van der Hoff
|
9b30c99a41
Merge branch 'master' into dinsic
|
5 gadi atpakaļ |
|
Richard van der Hoff
|
824c83e135
Clean up setup.py and add a __version__ identifier
|
6 gadi atpakaļ |
 Matthew Hodgson
|
fa6a5e9818
support returning shadow HS from /info
|
6 gadi atpakaļ |
|
David Baker
|
b9b247326f
Merge branch 'master' into dbkr/dinsic_merge_unbind
|
6 gadi atpakaļ |
|
David Baker
|
a90ec3a469
Do proper SRV lookup
|
6 gadi atpakaļ |
 Michael Kaye
|
f8e22fc95f
Pin twisted to not upgrade to 18.x
|
6 gadi atpakaļ |
 Matrix
|
ff3c9c13a2
fix yaml thinkos
|
6 gadi atpakaļ |
|
David Baker
|
f348aa5d32
Bits of tidying up for SMS validation
|
8 gadi atpakaļ |
 Daniel Wagner-Hall
|
a6ed6e3c02
Generate public/private keypairs for 3pid invites
|
8 gadi atpakaļ |
|
Daniel Wagner-Hall
|
2be970b828
Switch from syutil to signedjson
|
8 gadi atpakaļ |
|
Matthew Hodgson
|
ab4f3047af
depend on the public syutil repo!
|
9 gadi atpakaļ |
