akkoma/test/web
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-02 20:42:40 +03:00
..
activity_pub Fix warning in TransmogrifierTest 2019-09-30 19:10:56 +07:00
admin_api Fix merge 2019-09-30 19:10:54 +07:00
auth Refactored Pleroma.Web.Auth.Authenticator 2019-05-01 13:28:04 +00:00
common_api common api: implement scrobbling 2019-09-30 10:39:17 +00:00
instances Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
mastodon_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
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 MongooseIM: Add basic integration endpoints. 2019-05-17 18:21:11 +02:00
oauth [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 2019-10-02 20:42:40 +03:00
ostatus Merge branch 'features/apc2s-media-upload' into 'develop' 2019-09-30 11:21:49 +00:00
pleroma_api/controllers Extract mascot actions from MastodonAPIController to MascotController 2019-09-30 19:32:43 +07: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 Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02: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
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