1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-24 20:15:04 +01:00
pleroma/test/web
lain d7f9679ff2 Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-10 12:38:51 +00:00
..
activity_pub Merge remote-tracking branch 'origin/develop' into reactions 2019-10-07 12:30:59 +02:00
admin_api Fix merge 2019-09-30 19:10:54 +07:00
auth
common_api Merge branch 'develop' into 'reactions' 2019-10-06 08:11:47 +00:00
feed Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
instances Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
mastodon_api Merge branch 'unicode-search' into 'develop' 2019-10-09 16:33:05 +00:00
media_proxy Bump copyright years of files changed in 2019 2019-09-18 23:21:11 +02:00
metadata Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +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 Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
pleroma_api/controllers Merge branch 'develop' into 'reactions' 2019-10-06 08:11:47 +00: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
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