1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-24 19:55:05 +01:00
pleroma/test/web
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
..
activity_pub Merge branch 'accept-embedded-announce-object' into 'develop' 2019-10-05 19:28:29 +00:00
admin_api Fix merge 2019-09-30 19:10:54 +07:00
auth
common_api CommonAPI: Create profile updates as public. 2019-10-05 14:53:50 +02: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/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 2019-10-06 11:43:49 +03:00
media_proxy Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
metadata Pleroma.Web.Metadata - tests 2019-07-12 16:42:54 +00:00
mongooseim
oauth Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 2019-10-06 11:43:49 +03:00
ostatus Merge branch 'features/apc2s-media-upload' into 'develop' 2019-09-30 11:21:49 +00:00
pleroma_api/controllers Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
plugs Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
push Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
rich_media test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1 2019-08-20 20:20:12 +00:00
salmon Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
streamer tests: streamer: add a test for blocked transitive activities 2019-10-04 15:17:32 +00:00
twitter_api [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 2019-10-02 20:42:40 +03:00
views Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
web_finger Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
websub Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
fallback_test.exs [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ 2019-07-26 20:27:38 +00:00
federator_test.exs Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
masto_fe_controller_test.exs Fix credo warning 2019-10-02 21:12:01 +07:00
node_info_test.exs Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
rel_me_test.exs Implement missing mocks for rel=me 2019-08-25 08:03:25 +02:00
uploader_controller_test.exs Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00