 Andrew Morgan
|
73550e0aff
OpenSSL module required
|
5 gadi atpakaļ |
 Michael Kaye
|
792892173b
Merge pull request #97 from matrix-org/michaelkaye/bugfix_87
|
6 gadi atpakaļ |
|
Michael Kaye
|
f9ccb989f6
Move to explicit imports
|
6 gadi atpakaļ |
|
Michael Kaye
|
361a5bceb1
Suggested change away from "newline" to "comma"
|
6 gadi atpakaļ |
|
Michael Kaye
|
c07b55d087
Bugfix missing import
|
6 gadi atpakaļ |
|
Michael Kaye
|
bdae711f56
Merge pull request #86 from matrix-org/matthew/shadow-server
|
6 gadi atpakaļ |
|
Michael Kaye
|
056e5f8b51
Merge branch 'dinsic' into matthew/shadow-server
|
6 gadi atpakaļ |
|
Michael Kaye
|
1de07b6310
Merge pull request #96 from jp-modernisation-gouv-fr/sydent-wording-html
|
6 gadi atpakaļ |
|
Michael Kaye
|
8b8d9ae8b7
Merge pull request #87 from matrix-org/matthew/nonshadow-ips
|
6 gadi atpakaļ |
 jp-modernisation-gouv-fr
|
b99061e214
change wording on html part
|
6 gadi atpakaļ |
|
Michael Kaye
|
a7afe6fa25
Merge pull request #93 from jp-modernisation-gouv-fr/dinsic
|
6 gadi atpakaļ |
|
jp-modernisation-gouv-fr
|
38413b7274
Merge pull request #1 from jp-modernisation-gouv-fr/jp-modernisation-gouv-fr-patch-1
|
6 gadi atpakaļ |
|
jp-modernisation-gouv-fr
|
51ae644a0e
Update invite_template_dinsic.eml
|
6 gadi atpakaļ |
|
jp-modernisation-gouv-fr
|
a4aac371db
change email wording
|
6 gadi atpakaļ |
 Matthew Hodgson
|
79af7826ae
set blank shadow_hs if there is none (but we're no non-shadow ip)
|
6 gadi atpakaļ |
|
Matthew Hodgson
|
4619603e66
return both shadow & normal hs to nonshadow users
|
6 gadi atpakaļ |
|
Matthew Hodgson
|
fa6a5e9818
support returning shadow HS from /info
|
6 gadi atpakaļ |
|
Matthew Hodgson
|
a9a0313684
fix config defaults
|
6 gadi atpakaļ |
|
Matthew Hodgson
|
e2ff96ff02
explicitly rewrite shadow mxids correctly
|
6 gadi atpakaļ |
|
Matthew Hodgson
|
79c989a778
allow replication of IS bindings to a shadow server
|
6 gadi atpakaļ |
 David Baker
|
14d5849019
Merge pull request #78 from matrix-org/dbkr/delete_profiles
|
6 gadi atpakaļ |
 David Baker
|
c83733b15a
Remove deactivated users from profile search
|
6 gadi atpakaļ |
|
David Baker
|
d8793cde81
Merge pull request #72 from matrix-org/dbkr/dinsic_merge_unbind
|
6 gadi atpakaļ |
|
David Baker
|
b9b247326f
Merge branch 'master' into dbkr/dinsic_merge_unbind
|
6 gadi atpakaļ |
|
Michael Kaye
|
e6c4460247
Merge pull request #70 from matrix-org/update_verification_template
|
6 gadi atpakaļ |
 giomfo
|
9ad2c2e3f0
Update the verification email template
|
6 gadi atpakaļ |
|
Michael Kaye
|
39dc838cc7
Merge pull request #69 from matrix-org/update_invite_template
|
6 gadi atpakaļ |
|
giomfo
|
67e0753e46
Update the email template for Tchap invite
|
6 gadi atpakaļ |
|
giomfo
|
1c7bbcabbe
Update the email template for Tchap invite
|
6 gadi atpakaļ |
 eleutheria
|
207531d2c4
Merge branch 'master' of github.com:matrix-org/sydent
|
6 gadi atpakaļ |
