Brendan Abolivier f06bc8e068 Merge branch 'master' into dinsic 3 rokov pred
..
.gitignore 27ed026f3a Add directory and instructions about changelog files 4 rokov pred
301.misc b49d2d76f0 Changelog 4 rokov pred
317.bugfix 0f826b6793 Extract the first 3 chars during 3pid obfuscation, not just the 3rd char (#317) 4 rokov pred
318.misc 5a874b1951 Update test logging to be able to accept braces (#318) 4 rokov pred
321.misc e76e43c0f1 Rename third_party_invite_x_{obfuscate,reveal}_characters option (#321) 4 rokov pred
322.feature f265db2393 Add an option, always_obfuscate, to control whether parts of email addresses should always be redacted (#322) 4 rokov pred
323.feature e70fa312f3 Add an option, third_party_invite_username_separator_string, that allows redacting separate portions of a third party invite address (#323) 4 rokov pred
324.feature c33d976e7a Change out the triple-dot sequence in third-party invites to an ellipsis character (#324) 4 rokov pred
325.misc 55ea646931 Install prometheus_client in the Docker image as well (#325) 3 rokov pred
326.feature 4e0274ddc9 Accept an optional web-client argument for the invite. (#326) 3 rokov pred
328.feature 4d96e71bfe Support branded templates. (#328) 3 rokov pred
334.misc 72133eab9a Bump the version of signedjson to 1.1.1. (#334) 3 rokov pred
335.docker d078590e6a Fix building docker images (#335) 3 rokov pred
337.bugfix 2e6b00a2dd Be stricter about JSON that is accepted by Sydent (#337) 3 rokov pred