-
- Downloads
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
Showing
- CHANGELOG.md 3 additions, 0 deletionsCHANGELOG.md
- config/config.exs 43 additions, 1 deletionconfig/config.exs
- config/test.exs 4 additions, 0 deletionsconfig/test.exs
- docs/config.md 8 additions, 3 deletionsdocs/config.md
- docs/config/custom_emoji.md 1 addition, 1 deletiondocs/config/custom_emoji.md
- installation/pleroma.supervisord 21 additions, 0 deletionsinstallation/pleroma.supervisord
- lib/mix/tasks/pleroma/instance.ex 15 additions, 2 deletionslib/mix/tasks/pleroma/instance.ex
- lib/mix/tasks/pleroma/sample_config.eex 1 addition, 1 deletionlib/mix/tasks/pleroma/sample_config.eex
- lib/pleroma/activity.ex 32 additions, 28 deletionslib/pleroma/activity.ex
- lib/pleroma/emails/admin_email.ex 5 additions, 2 deletionslib/pleroma/emails/admin_email.ex
- lib/pleroma/emails/user_email.ex 2 additions, 1 deletionlib/pleroma/emails/user_email.ex
- lib/pleroma/user.ex 2 additions, 0 deletionslib/pleroma/user.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 4 additions, 5 deletionslib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/activity_pub/activity_pub_controller.ex 4 additions, 3 deletionslib/pleroma/web/activity_pub/activity_pub_controller.ex
- lib/pleroma/web/activity_pub/transmogrifier.ex 1 addition, 2 deletionslib/pleroma/web/activity_pub/transmogrifier.ex
- lib/pleroma/web/activity_pub/utils.ex 6 additions, 1 deletionlib/pleroma/web/activity_pub/utils.ex
- lib/pleroma/web/common_api/utils.ex 0 additions, 1 deletionlib/pleroma/web/common_api/utils.ex
- lib/pleroma/web/endpoint.ex 4 additions, 9 deletionslib/pleroma/web/endpoint.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 18 additions, 3 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
- lib/pleroma/web/mastodon_api/views/status_view.ex 9 additions, 5 deletionslib/pleroma/web/mastodon_api/views/status_view.ex
Loading
Please register or sign in to comment