Ivan Tashkinov 226f4d5ef9 Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks ... # Conflicts: # test/web/admin_api/admin_api_controller_test.exs		2020-02-18 17:52:31 +03:00
..
activity_pub	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
admin_api	Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks	2020-02-18 17:52:31 +03:00
auth	Refactored Pleroma.Web.Auth.Authenticator	2019-05-01 13:28:04 +00:00
common_api	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
feed	fix test	2020-01-27 21:20:33 +03:00
instances	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
mastodon_api	Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks	2020-02-18 17:52:31 +03:00
media_proxy	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
metadata	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
mongooseim	MongooseIM: Add basic integration endpoints.	2019-05-17 18:21:11 +02:00
oauth	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
ostatus	OStatus controller: don't serve json at /notice/, redirect instead	2019-11-25 17:55:17 +03:00
pleroma_api/controllers	EmojiReactions: Remove old API endpoints	2020-02-07 15:01:45 +01:00
plugs	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
push	added privacy option to push notifications	2019-11-28 22:13:11 +03:00
rich_media	Use floki's new APIs for parsing fragments	2020-02-16 01:55:26 +03:00
static_fe	Support redirecting by activity UUID in static FE as well.	2019-11-13 08:22:11 -08:00
streamer	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
twitter_api	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
views	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
web_finger	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
chat_channel_test.exs	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01:00
fallback_test.exs	[#1097] added redirect: /pleroma/admin -> /pleroma/admin/	2019-07-26 20:27:38 +00:00
federator_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
masto_fe_controller_test.exs	[#2068] Introduced proper OAuth tokens usage to controller tests.	2019-12-19 17:23:27 +03:00
node_info_test.exs	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
rel_me_test.exs	add missing tesla mocks	2019-11-04 15:18:32 +00:00
uploader_controller_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00