lain 7d542450b1 Merge branch 'develop' into '1865-media-only' ... # Conflicts: # CHANGELOG.md		2020-06-20 09:33:18 +00:00
..
activity_pub	moving custom ecto types in context folders	2020-06-16 17:50:33 +03:00
admin_api	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	2020-06-17 13:13:55 -05:00
api_spec	Add OpenAPI spec for PleromaAPI.EmojiAPIController	2020-05-18 19:28:46 +04:00
auth	copyright update	2020-05-18 15:15:51 +03:00
common_api	SideEffects: Move streaming of chats to after the transaction.	2020-06-07 14:52:56 +02:00
feed	[#1501] Made user feed contain public and unlisted activities.	2020-05-25 23:27:47 +03:00
instances
mastodon_api	Merge branch 'develop' into '1865-media-only'	2020-06-20 09:33:18 +00:00
media_proxy	fix test	2020-06-18 05:06:28 +03:00
metadata	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
mongooseim	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
oauth	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
ostatus	OStatusController: Add Mastodon activity compat route.	2020-05-22 17:11:59 +02:00
pleroma_api	ChatController: Remove nonsensical pagination.	2020-06-08 11:09:53 +02:00
plugs
push	WebPush: Don't break on contentless chat messages.	2020-06-06 09:46:07 +02:00
rich_media	Fix tests	2020-06-15 16:20:05 +04:00
static_fe	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
streamer	ChatMessageReference -> Chat.MessageReference	2020-06-06 11:51:10 +02:00
twitter_api	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
views
web_finger
chat_channel_test.exs
fallback_test.exs
federator_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
masto_fe_controller_test.exs
node_info_test.exs	InstanceView: Add pleroma chat messages to nodeinfo	2020-05-13 14:05:22 +02:00
rel_me_test.exs	don't use async with global mocks	2020-05-13 11:38:23 +03:00
uploader_controller_test.exs