Commit Graph

3287 Commits (a4a2d3864049e03599057ab87ead4aea423c47eb)

Author SHA1 Message Date
lain 04abee782b AntiSpamLinkPolicy: Exempt local users.
4 years ago
lain 84f9ca1956 Blocking: Don't federate if the options is set.
4 years ago
lain 44bb7cfccd ActivityPub: Remove `block`.
4 years ago
lain e38293c8f1 Transmogrifier: Switch to pipeline for Blocks.
4 years ago
lain 89e5b2046b ObjectValidator: Basic `Block` support.
4 years ago
lain d137f934df Transmogrifier Test: Extract block handling.
4 years ago
lain 35f6770436 StatusView: Add pleroma.parent_visible
4 years ago
lain 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
4 years ago
lain 98af7b59e4 Merge branch 'update-validator' into 'develop'
4 years ago
Roman Chvanikov 1471b70ef1 Merge develop
4 years ago
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
4 years ago
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1
4 years ago
lain adc199c6a8 ActivityPubControllerTest: Capture error log
4 years ago
lain d93e01137b ActivityPubControllerTest: Testing changes.
4 years ago
lain 2737809bbf An act of desperation.
4 years ago
lain 2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
lain 46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop'
4 years ago
Egor Kislitsyn 7e6f43c0d7
Add `is_muted` to notifications
4 years ago
lain 59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop'
4 years ago
lain 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
4 years ago
lain e785cd5cae ActivityPub: Remove `update` and switch to pipeline.
4 years ago
rinpatch c75ba63bef Merge branch '1865-media-only' into 'develop'
4 years ago
lain 1e7ca24430 Update Handling Test: Fix for re-used update ids.
4 years ago
lain 31a4d42ce0 SideEffects: Handle user updating.
4 years ago
rinpatch 282f492cd5 Merge branch '1883-mrf-chat' into 'develop'
4 years ago
lain 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop'
4 years ago
lain 35e9282ffd HellthreadPolicy: Restrict to Notes and Articles.
4 years ago
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE
4 years ago
lain 31761340fe Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
4 years ago
lain 7d542450b1 Merge branch 'develop' into '1865-media-only'
4 years ago
Alexander Strizhakov 1a704e1f1e
fix for packs pagination
4 years ago
Haelwenn (lanodan) Monnier 3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
4 years ago
feld f928267773 Merge branch 'issue/1855' into 'develop'
4 years ago
Sergey Suprunenko b63646169d
Add support for bot field in update_credentials
4 years ago
lain 75670a99e4 UpdateValidator: Only allow updates from the user themselves.
4 years ago
lain abdb540d45 ObjectValidators: Add basic UpdateValidator.
4 years ago
Ivan Tashkinov 5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
lain 7e488cd4a7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Alexander Strizhakov 3e3f9253e6
adding overall count for packs and files
4 years ago
Alexander Strizhakov 4975ed86bc
emoji pagination for pack show action
4 years ago
Alexander Strizhakov 3becdafd33
emoji packs pagination
4 years ago
Maksim Pechnikov 4044f24e2e fix test
4 years ago
Mark Felder 2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
4 years ago
Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855
4 years ago
lain d772361e62 Merge branch 'fix/1787-mogrify-args' into 'develop'
4 years ago
Maksim 96493da7bd Apply suggestion to test/web/media_proxy/invalidation_test.exs
4 years ago
Maksim 078d687e6e Apply suggestion to test/web/media_proxy/media_proxy_controller_test.exs
4 years ago
Maksim 2991aae4c4 Apply suggestion to test/web/media_proxy/invalidations/script_test.exs
4 years ago
Maksim 11b22a4229 Apply suggestion to test/web/media_proxy/invalidations/http_test.exs
4 years ago
Maksim 6d33a3a51b Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim 793a53f1ec Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
Maksim 1b45bc7b2a Apply suggestion to test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
4 years ago
rinpatch 4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop'
4 years ago
Haelwenn b536e57124 Merge branch '1866-last-status-stuff' into 'develop'
4 years ago
Alexander Strizhakov b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group
4 years ago
Alexander Strizhakov 3c2cee33ad
moving custom ecto types in context folders
4 years ago
Alexander Strizhakov 9a4fde9766
Mogrify args as custom tuples
4 years ago
lain 015f9258a9 Transmogrifier: Extract user update handling tests.
4 years ago
lain 1eb6cedaad ActivityPub: When restricting to media posts, only show 'Creates'.
4 years ago
stwf faba1a6e33 fix tests
4 years ago
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855
4 years ago
Egor Kislitsyn bd63089a63
Fix tests
4 years ago
Egor Kislitsyn 58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Maksim Pechnikov 62b8c31b7a added tests
4 years ago
lain b7df7436c8 Conversations: Return last dm for conversation, not last message.
4 years ago
Maksim Pechnikov 2e8a236cef fix invalidates media url's
4 years ago
eugenijm b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch 271ea5068f Merge branch '1851-favorites-pagination' into 'develop'
4 years ago
href cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn 520367d6fd Fix atom leak in Rich Media Parser
4 years ago
Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data
4 years ago
Haelwenn 4115701f71 Merge branch 'recipients-experiments' into 'develop'
4 years ago
Egor Kislitsyn 697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain e557265a03 Merge branch 'global-status-expiration' into 'develop'
4 years ago
Maksim Pechnikov f9dcf15ecb added admin api for MediaProxy cache invalidation
4 years ago
Ivan Tashkinov 2188097066 [#1794] Fixes URI query handling for hashtags extraction in search.
4 years ago
Egor Kislitsyn 1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Ivan Tashkinov b28cec4271 [#1794] Fixes URI query handling for hashtags extraction in search.
4 years ago
lain 5d87405b51 ActivityPubTest: Update test for atomized parameters.
4 years ago
Thibaut Girka 570123ae21 Add test
4 years ago
rinpatch 7aa6c82937 Merge branch 'remake-remodel-dms' into 'develop'
4 years ago
lain 600e2ea073 ActivityPubTest: Make test easier to understand.
4 years ago
lain 9e411372d0 ActivityPub: Don't show announces of your own objects in timeline.
4 years ago
Egor Kislitsyn 3dd1de61a7 Add `url` field to AdminAPI.AccountView
4 years ago
lain 063e6b9841 StatusController: Correctly paginate favorites.
4 years ago
lain 064c4f86f3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Roman Chvanikov 604a83ae3e merge develop
4 years ago
Egor Kislitsyn d44843e677
Restrict ActivityExpirationPolicy to Notes only
4 years ago
Egor Kislitsyn da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
lain d192492658 Merge branch 'openapi/admin/relay' into 'develop'
4 years ago
lain 3b5282bef2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 89b85f6529 ChatController: Remove nonsensical pagination.
4 years ago
lain 7d66dd180a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain fe2a5d0614 ChatController: Make last_read_id mandatory.
4 years ago
lain 801e668a97 ChatController: Add `last_read_id` option to mark_as_read.
4 years ago
lain 2cdaac4330 SideEffects: Move streaming of chats to after the transaction.
4 years ago
lain f4cf4ae16e ChatController: Use new oauth scope *:chats.
4 years ago
Haelwenn (lanodan) Monnier e1b07402ab
User: Add raw_bio, storing unformatted bio
4 years ago
lain ca0e6e702b ChatMessageReference -> Chat.MessageReference
4 years ago
lain 4e8c0eecd5 WebPush: Don't break on contentless chat messages.
4 years ago
Egor Kislitsyn b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
4 years ago
lain a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn d74985af23 Merge branch 'features/apc2s-pagination' into 'develop'
4 years ago
lain 115d08a754 Pipeline: Add a side effects step after the transaction finishes
4 years ago
lain 0efa8aa0b9 Transmogrifier: For follows, create notifications last.
4 years ago
lain cc8a7dc205 SideEffects / ChatView: Add an unread cache.
4 years ago
lain d44da91bbf SubscriptionOperation: Let chat mentions through.
4 years ago
Egor Kislitsyn 317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
4 years ago
lain 74edd4f391 Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 56dfa0e0fb Transmogrifier: Update notification after accepting.
4 years ago
lain 41503b1673 Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs
4 years ago
lain 00748e9650 ChatMessageReferences: Change seen -> unread
4 years ago
stwf a42d135cce test fix
4 years ago
minibikini b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay'
4 years ago
lain b952f3f379 WebPush: Push out chat message notications.
4 years ago
lain 5d7dda883e SideEffectsTest: More tests.
4 years ago
Egor Kislitsyn a8132690bd
Fix credo
4 years ago
Egor Kislitsyn 70f054b083
Merge branch 'develop' into openapi/admin/relay
4 years ago
Egor Kislitsyn b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
4 years ago
stwf 3b8180d7d1 add status_net/config
4 years ago
stwf dbcc1b105e encode data properly
4 years ago
stwf 29ae5bb771 preload data into index.html
4 years ago
lain b3407344d3 ChatController: Add function to mark single message as read.
4 years ago
lain c020fd4352 ChatMessageReferenceView: Return read status as `unread`.
4 years ago
Egor Kislitsyn c16315d055
Add OpenAPI spec for AdminAPI.ReportController
4 years ago
Egor Kislitsyn 9d572f2f66
Move report actions to AdminAPI.ReportController
4 years ago
lain fb4ae9c720 Streamer, SideEffects: Stream out ChatMessageReferences
4 years ago
lain 7f5c5b11a5 Chats: Remove `unread` from the db, calculate from unseen messages.
4 years ago
lain f3ccd50a33 ChatMessageReferences: Adjust views
4 years ago
lain aa22fce8f4 ChatMessageReference: Introduce and switch in chat controller.
4 years ago
feld 6c1c2cddec Merge branch 'fix/1794-hashtag-search-results' into 'develop'
4 years ago
Egor Kislitsyn 68cb152a08
Merge branch 'develop' into openapi/admin/relay
4 years ago
lain 879304dcd9 Merge branch 'replies-domain-block' into 'develop'
4 years ago
lain 5da38c15cd Merge branch 'openapi/admin/oauth-apps' into 'develop'
4 years ago
lain 022d975a39 Merge branch 'openapi/admin/invites' into 'develop'
4 years ago
lain 904295d53b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 37542a9dfa Activity: Remove notifications-related functions.
4 years ago
lain 127ccc4e1c NotificationController: Don't return chat_mentions by default.
4 years ago
lain cd2abcc0e3 Merge branch 'fix/invisible-repeats' into 'develop'
4 years ago
rinpatch 165a4b2a69 Do not include activities of invisible users unless explicitly requested
4 years ago
lain d111eae798 Merge branch 'feature/status-by-id-account-view' into 'develop'
4 years ago
lain 8e1db6a835 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alexander Strizhakov 19f468c5bc
replies filtering for blocked domains
4 years ago
rinpatch 6fb900a496 Merge branch 'user-updates' into 'develop'
4 years ago
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains
4 years ago
lain af9090238e CommonAPI: Newlines -> br for chat messages.
4 years ago
Egor Kislitsyn a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
lain d4d4b92f75 TimelineController: Only return `Create` in public timelines.
4 years ago
lain 9460983032 AccountController: Federate user account changes.
4 years ago
lain 6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 8bdf18d7c1 CommonAPI: Linkify chat messages.
4 years ago
lain 2c9465cc51 SafeText: Let through basic html.
4 years ago
lain b004c427a0 Merge branch 'conversation-pagination' into 'develop'
4 years ago
Steven Fuchs 6d4b80822b Conversation pagination
4 years ago
Ivan Tashkinov 24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
4 years ago
Ivan Tashkinov 78c80a261a Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
4 years ago
Roman Chvanikov 0a83af330b fix unused var warning
4 years ago
Ivan Tashkinov c181e555db [#1794] Improvements to hashtags extraction from search query.
4 years ago
kPherox 9ca978494f
Add test for stream boosts of mastodon user
4 years ago
Haelwenn (lanodan) Monnier a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
4 years ago
Haelwenn (lanodan) Monnier b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain 863c02b25d SideEffects: Stream out chat messages.
4 years ago
lain c86a88edec Streamer: Add a chat message stream.
4 years ago
lain 9848978109 Merge branch 'fix-relay-repeat-notification' into 'develop'
4 years ago
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 396bc69aee Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
4 years ago
Egor Kislitsyn 06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
4 years ago
Egor Kislitsyn d1ee3527ef
Move config actions to AdminAPI.ConfigController
4 years ago
lain f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop'
4 years ago
Mark Felder 9eea800026 Refactor notification settings
4 years ago
rinpatch 8f6d428880 AccountView: Use mediaproxy URLs for emojis
4 years ago
rinpatch 78c46fb7ba MediaProxy test: use config macros instead of directly putting values
4 years ago
kPherox 48fd9be65a
Exclude post actor from to of relay announce
4 years ago
rinpatch d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop'
4 years ago
Alexander Strizhakov 3249141588
validate actor type
4 years ago
rinpatch 3601c0015c Merge branch '1808-pleroma-sucks' into 'develop'
4 years ago
Egor Kislitsyn fca48154a2
Add AdminAPI.InviteView
4 years ago
Egor Kislitsyn 2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
4 years ago
Egor Kislitsyn 95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
4 years ago
Alexander Strizhakov 8f08384d80
another view for account in admin-fe status_show
4 years ago
Ivan Tashkinov d7a57004ef [#1501] Made user feed contain public and unlisted activities.
4 years ago
Egor Kislitsyn 0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
4 years ago
lain dbd07d29a3 Streamer: Don't crash on streaming chat notifications
4 years ago
lain 2c25087d20 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 6bd7070b00 Transmogrifier: Use a simpler way to get mentions.
4 years ago
Egor Kislitsyn cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
4 years ago
lain f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
4 years ago
lain 5d5db7e5b7 StealEmojiPolicyTest: Clean up.
4 years ago
lain 2dff376041 StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain aeb0875025 StealEmojiPolicyTest: Fix flaky test.
4 years ago
lain ec470c4c77 Merge branch 'openapi/admin/status' into 'develop'
4 years ago
lain d0c26956da User: Don't error out if we want to refresh a user but can't
4 years ago
rinpatch 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop'
4 years ago
lain ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop'
4 years ago
Roman Chvanikov cc82229ba7 Add filename_display_max_length config
4 years ago
lain 91c8467582 OStatusController: Add Mastodon activity compat route.
4 years ago
lain 355aa3bdc7 ActivityPubController: Add Mastodon activity compat route.
4 years ago
lain 8a4bd9e5d1 OStatusController: Add Mastodon compatibility route for objects.
4 years ago
rinpatch 1fa7aa9fc5 Merge branch 'emoji-react-better-errors' into 'develop'
4 years ago
Egor Kislitsyn ba106aa9c8
Fix notifications mark as read API
4 years ago
lain ca755f9a73 ActivityPubController: Add Mastodon compatibility route.
4 years ago
lain bcb549531f EmojiReactionController: Return more appropriate error.
4 years ago
Haelwenn 7b02bfca51 Merge branch 'announce-validator' into 'develop'
4 years ago
Haelwenn a57e7f3503 Merge branch '1113-op-mentioning' into 'develop'
4 years ago
lain 578ed3a37f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain a42a0716ec Merge branch 'features/emoji_stealer' into 'develop'
4 years ago
lain f166316f50 Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
4 years ago
Egor Kislitsyn 45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
4 years ago
lain cc0d462e91 Attachments: Have the mediaType on the root, too.
4 years ago
lain 814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain bf1b221f94 Credo fixes for the credo god.
4 years ago
lain cdc6ba8d7b AnnounceValidator: Check for announcability
4 years ago
lain c76267afb9 Credo fixes.
4 years ago
lain 23e248694d Announcements: Fix all tests.
4 years ago
lain d9d425708e SideEffects: Builed out Announce effects.
4 years ago
Egor Kislitsyn 9de9760aa6
Move status actions to AdminAPI.StatusController
4 years ago
lain 39031f4860 Pipeline: Don't federate if federation is disabled.
4 years ago
lain e42bc5f557 Announcements: Handle through common pipeline.
4 years ago
lain 265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop'
4 years ago
lain c7cdc553ff Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
4 years ago
lain 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop'
4 years ago
lain eb5f428565 CommonAPI: Change public->private implicit addressing.
4 years ago
Egor Kislitsyn 5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
4 years ago
Egor Kislitsyn f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
4 years ago
Egor Kislitsyn 9a5de0f454
Move reaction actions to EmojiReactionController
4 years ago
Egor Kislitsyn 490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
4 years ago
Haelwenn 94ba5a7802 Merge branch 'exposed-background-image' into 'develop'
4 years ago
lain 6dd1575c64 Merge branch 'issue/1509' into 'develop'
4 years ago
Egor Kislitsyn 6609714d66
Move Scrobble views to ScrobbleView
4 years ago
Egor Kislitsyn 524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
4 years ago
Haelwenn 58ccd2bbfd Merge branch 'openapi/pleroma-api/mascot' into 'develop'
4 years ago
Maksim Pechnikov 41f8f17260 fix api/v1/accounts/update_credentials
4 years ago
Maksim Pechnikov 5f0a3ac74d added tests
4 years ago
lain d19c716770 AttachmentValidator: Handle empty mediatypes
4 years ago
Egor Kislitsyn fe5d423b43
Add OpenAPI spec for MascotController
4 years ago
Egor Kislitsyn 45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
4 years ago
lain be4db41d71 ChatMessageValidator: Allow one message in an array, too.
4 years ago
lain 0d417e005d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn aef31c69df
Rename EmojiAPIController to EmojiPackController
4 years ago
Egor Kislitsyn 8bde8dfec2
Cleanup Pleroma.Emoji.Pack
4 years ago
Egor Kislitsyn 6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
4 years ago
lain 0d5bce018d AnnounceValidator: Validate for existing announce
4 years ago
lain 17a8342c1e ObjectValidators: Add basic Announce validator.
4 years ago
lain 63ab2743ce TransmogrifierTest: Fix tests.
4 years ago
lain 7d381b16b7 Transmogrifier Test: Extract Announce handling.
4 years ago
Alexander Strizhakov 215daabdb4
copyright update
4 years ago
lain 188b32145e InstanceView: Expose background image link.
4 years ago
lain 96f7b1b140 Merge branch 'show-media-endpoint-fixes' into 'develop'
4 years ago