Merge branch 'output-of-relationships-in-statuses' into 'develop'
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications See merge request pleroma/pleroma!2342
No related branches found
No related tags found
Showing
- CHANGELOG.md 1 addition, 1 deletionCHANGELOG.md
- benchmarks/load_testing/fetcher.ex 15 additions, 6 deletionsbenchmarks/load_testing/fetcher.ex
- config/config.exs 2 additions, 0 deletionsconfig/config.exs
- lib/mix/tasks/pleroma/benchmark.ex 2 additions, 1 deletionlib/mix/tasks/pleroma/benchmark.ex
- lib/pleroma/user_relationship.ex 14 additions, 4 deletionslib/pleroma/user_relationship.ex
- lib/pleroma/web/admin_api/admin_api_controller.ex 3 additions, 3 deletionslib/pleroma/web/admin_api/admin_api_controller.ex
- lib/pleroma/web/admin_api/views/report_view.ex 6 additions, 1 deletionlib/pleroma/web/admin_api/views/report_view.ex
- lib/pleroma/web/common_api/activity_draft.ex 1 addition, 1 deletionlib/pleroma/web/common_api/activity_draft.ex
- lib/pleroma/web/controller_helper.ex 21 additions, 3 deletionslib/pleroma/web/controller_helper.ex
- lib/pleroma/web/mastodon_api/controllers/account_controller.ex 13 additions, 2 deletions...leroma/web/mastodon_api/controllers/account_controller.ex
- lib/pleroma/web/mastodon_api/controllers/notification_controller.ex 6 additions, 2 deletions...a/web/mastodon_api/controllers/notification_controller.ex
- lib/pleroma/web/mastodon_api/controllers/search_controller.ex 19 additions, 5 deletions...pleroma/web/mastodon_api/controllers/search_controller.ex
- lib/pleroma/web/mastodon_api/controllers/status_controller.ex 21 additions, 5 deletions...pleroma/web/mastodon_api/controllers/status_controller.ex
- lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex 32 additions, 8 deletions...eroma/web/mastodon_api/controllers/timeline_controller.ex
- lib/pleroma/web/mastodon_api/views/account_view.ex 10 additions, 5 deletionslib/pleroma/web/mastodon_api/views/account_view.ex
- lib/pleroma/web/mastodon_api/views/notification_view.ex 17 additions, 13 deletionslib/pleroma/web/mastodon_api/views/notification_view.ex
- lib/pleroma/web/mastodon_api/views/status_view.ex 8 additions, 3 deletionslib/pleroma/web/mastodon_api/views/status_view.ex
- lib/pleroma/web/pleroma_api/controllers/account_controller.ex 7 additions, 2 deletions...pleroma/web/pleroma_api/controllers/account_controller.ex
- lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex 13 additions, 4 deletions...oma/web/pleroma_api/controllers/pleroma_api_controller.ex
- priv/repo/migrations/20190414125034_migrate_old_bookmarks.exs 0 additions, 1 deletion.../repo/migrations/20190414125034_migrate_old_bookmarks.exs
Loading
Please register or sign in to comment