hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit

Browse source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Ivan Tashkinov 2019-06-30 16:05:00 +03:00
commit a799418573
9 changed files with 86 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/config.md
View file

@ -36,7 +36,7 @@ No specific configuration.
This filter replaces the filename (not the path) of an upload. For complete obfuscation, add
`Pleroma.Upload.Filter.Dedupe` before AnonymizeFilename.
* `text`: Text to replace filenames in links. If empty, `{random}.extension` will be used.
* `text`: Text to replace filenames in links. If empty, `{random}.extension` will be used. You can get the original filename extension by using `{extension}`, for example `custom-file-name.{extension}`.
## Pleroma.Emails.Mailer
* `adapter`: one of the mail adapters listed in [Swoosh readme](https://github.com/swoosh/swoosh#adapters), or `Swoosh.Adapters.Local` for in-memory mailbox.