Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs		2020-07-19 20:05:37 +03:00
..
activity_pub	Merge branch 'features/mrf-reasons' into 'develop'	2020-07-15 14:00:22 +00:00
admin_api	[#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations.	2020-07-14 19:31:05 +03: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	ActivityPub: Remove follow and fix issues.	2020-07-08 17:07:24 +02:00
feed	[#1501] Made user feed contain public and unlisted activities.	2020-05-25 23:27:47 +03:00
instances	Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).	2020-03-20 18:33:00 +03:00
mastodon_api	OpenAPI: Add :id to follower/following endpoints, fixes #1958	2020-07-17 12:35:28 -05:00
media_proxy	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-19 20:05:37 +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	AccountController: Remove unused update_? routes.	2020-07-07 16:53:20 +02:00
plugs	Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.	2020-04-30 18:19:51 +03:00
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 branch 'develop' into refactor/notification_settings	2020-07-13 13:32:21 -05:00
views
web_finger	WebFinger Test: Add back test.	2020-05-05 09:55:33 +02:00
chat_channel_test.exs	Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).	2020-03-20 18:33:00 +03:00
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	don't use async with global mocks	2020-05-13 11:38:23 +03:00
uploader_controller_test.exs