Ivan Tashkinov 2def3cbf41 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # mix.lock		2020-08-11 15:13:29 +03:00
..
activity_pub	CommonValidations: Extract modification right checker	2020-08-05 17:26:53 +02:00
admin_api	Merge branch '204-fix' into 'develop'	2020-08-11 09:18:56 +00: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	CommonAPITest: Add test that deactivated users can't post.	2020-08-04 14:08:12 +02:00
feed	feed/user_controller: Return 404 when the user is remote	2020-07-29 14:02:02 +02:00
instances
mastodon_api	AccountController: Build the correct update activity.	2020-08-10 10:33:05 +02:00
media_proxy	Removed unused alias.	2020-08-07 09:43:49 +03:00
metadata	rel me test: fix HTML so broken browsers (and therefore	2020-08-07 16:45:33 +03:00
mongooseim
oauth	Merge branch 'develop' into fix/ldap-auth-issues	2020-08-07 14:55:22 -05:00
ostatus	OStatusController: Add Mastodon activity compat route.	2020-05-22 17:11:59 +02:00
pleroma_api	ChatMessageReferenceView: Display preview cards.	2020-07-30 19:57:26 +02:00
plugs
preload	Preloaders: Remove status_net preloader	2020-07-06 12:24:45 +02:00
push	Lint	2020-06-26 14:35:04 -05:00
rich_media	Fix tests	2020-06-15 16:20:05 +04:00
static_fe	StaticFE: Prioritize json in requests.	2020-06-26 16:27:39 +02:00
streamer	Streamer: Don't filter out announce notifications.	2020-07-04 17:11:37 +02:00
twitter_api	Merge remote-tracking branch 'upstream/develop' into by-approval	2020-07-26 15:46:14 -05:00
views
web_finger
chat_channel_test.exs
fallback_test.exs	encode data properly	2020-06-03 16:34:03 -04:00
federator_test.exs	moving mrf settings from instance to separate group	2020-06-16 18:32:18 +03:00
masto_fe_controller_test.exs	Rename user.settings column	2020-06-30 11:50:53 -05:00
node_info_test.exs	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
rel_me_test.exs
uploader_controller_test.exs