Merge branch 'develop' into 'feature/staff-discovery-api'
# Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
Branches feature/staff-discovery-api
No related tags found
Showing
- lib/pleroma/filter.ex 62 additions, 0 deletionslib/pleroma/filter.ex
- lib/pleroma/formatter.ex 3 additions, 1 deletionlib/pleroma/formatter.ex
- lib/pleroma/web/activity_pub/activity_pub.ex 5 additions, 0 deletionslib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 63 additions, 2 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
- lib/pleroma/web/mastodon_api/mastodon_socket.ex 4 additions, 2 deletionslib/pleroma/web/mastodon_api/mastodon_socket.ex
- lib/pleroma/web/mastodon_api/views/account_view.ex 8 additions, 1 deletionlib/pleroma/web/mastodon_api/views/account_view.ex
- lib/pleroma/web/mastodon_api/views/filter_view.ex 27 additions, 0 deletionslib/pleroma/web/mastodon_api/views/filter_view.ex
- lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 5 additions, 1 deletionlib/pleroma/web/nodeinfo/nodeinfo_controller.ex
- lib/pleroma/web/router.ex 6 additions, 0 deletionslib/pleroma/web/router.ex
- lib/pleroma/web/twitter_api/views/activity_view.ex 2 additions, 1 deletionlib/pleroma/web/twitter_api/views/activity_view.ex
- priv/repo/migrations/20180813003722_create_filters.exs 20 additions, 0 deletionspriv/repo/migrations/20180813003722_create_filters.exs
- test/filter_test.exs 85 additions, 0 deletionstest/filter_test.exs
- test/formatter_test.exs 10 additions, 0 deletionstest/formatter_test.exs
- test/web/mastodon_api/account_view_test.exs 38 additions, 0 deletionstest/web/mastodon_api/account_view_test.exs
- test/web/mastodon_api/mastodon_api_controller_test.exs 119 additions, 0 deletionstest/web/mastodon_api/mastodon_api_controller_test.exs
- test/web/twitter_api/views/activity_view_test.exs 27 additions, 0 deletionstest/web/twitter_api/views/activity_view_test.exs
Loading
Please register or sign in to comment