Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (115 commits) Change test case wording Use `duration` param for mute expiration duration Emoji: apply recommended tail call changes Extract translatable strings Emoji: split qualification variation into a module Add authorized_fetch_mode to description.exs EmojiReactValidator: use new qualification method Emoji: implement full-qualifier using combinations EmojiReactValidator: fix emoji qualification Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'" Translated using Weblate (French) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) ...
This commit is contained in:
commit
550693111e
108 changed files with 24053 additions and 658 deletions
|
|
@ -81,6 +81,19 @@ server {
|
|||
proxy_pass http://phoenix;
|
||||
}
|
||||
|
||||
# Uncomment this if you want notice compatibility routes for frontends like Soapbox.
|
||||
# location ~ ^/@[^/]+/([^/]+)$ {
|
||||
# proxy_pass http://phoenix/notice/$1;
|
||||
# }
|
||||
#
|
||||
# location ~ ^/@[^/]+/posts/([^/]+)$ {
|
||||
# proxy_pass http://phoenix/notice/$1;
|
||||
# }
|
||||
#
|
||||
# location ~ ^/[^/]+/status/([^/]+)$ {
|
||||
# proxy_pass http://phoenix/notice/$1;
|
||||
# }
|
||||
|
||||
location ~ ^/(media|proxy) {
|
||||
proxy_cache pleroma_media_cache;
|
||||
slice 1m;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue