Henry Jameson
f9b13c754c
Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (269 commits)
Apply suggestion to docs/administration/CLI_tasks/user.md
rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
fixed `mix pleroma.instance gen`
Also add new sidebarRight setting
Add `background_image` to `InstanceOperation`
Move notification actions to PleromaAPI.NotificationController
Move conversation actions to PleromaAPI.ConversationController
Move reaction actions to EmojiReactionController
Add OpenAPI spec for PleromaAPI.PleromaAPIController
Changelog: Add background to instance
Docs: Add background_image in instance
InstanceOperation: Add background image to example
MastoFE: update to bundle-2020-05-20
Apply suggestion to installation/nginx-cache-purge.sh.example
update purge script
Synchronize :fe settings in config.exs
Fix summary
User.Query: Remove superfluous `distinct`
UserTest: Hide warning in tests.
...