Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' ...
authorfloatingghost <hannah@coffee-and-dreams.uk>
Mon, 18 Jul 2022 13:08:36 +0000 (13:08 +0000)
committerfloatingghost <hannah@coffee-and-dreams.uk>
Mon, 18 Jul 2022 13:08:36 +0000 (13:08 +0000)
commit54ed8760ff1d3416115a52c949b0d869fbfc3b28
treeb6e48cb37ca42660783ea0f48d3adffb43765d76
parent3cbc401fe0c0fc2da167ae2b1acd0f145cc293ba
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' (#85)

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/85
17 files changed:
docs/docs/development/API/admin_api.md
lib/pleroma/announcement.ex [new file with mode: 0644]
lib/pleroma/announcement_read_relationship.ex [new file with mode: 0644]
lib/pleroma/web/admin_api/controllers/announcement_controller.ex [new file with mode: 0644]
lib/pleroma/web/admin_api/views/announcement_view.ex [new file with mode: 0644]
lib/pleroma/web/api_spec/operations/admin/announcement_operation.ex [new file with mode: 0644]
lib/pleroma/web/api_spec/operations/announcement_operation.ex [new file with mode: 0644]
lib/pleroma/web/api_spec/schemas/announcement.ex [new file with mode: 0644]
lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex [new file with mode: 0644]
lib/pleroma/web/mastodon_api/views/announcement_view.ex [new file with mode: 0644]
lib/pleroma/web/router.ex
priv/repo/migrations/20220308012601_create_announcements.exs [new file with mode: 0644]
test/pleroma/announcement_read_relationship_test.exs [new file with mode: 0644]
test/pleroma/announcement_test.exs [new file with mode: 0644]
test/pleroma/web/admin_api/controllers/announcement_controller_test.exs [new file with mode: 0644]
test/pleroma/web/mastodon_api/controllers/announcement_controller_test.exs [new file with mode: 0644]
test/support/factory.ex