projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e81b4b
863ec33
)
Merge branch 'feature/funkwhale-audio' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Sun, 29 Mar 2020 19:18:22 +0000
(19:18 +0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Sun, 29 Mar 2020 19:18:22 +0000
(19:18 +0000)
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
1
2
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/views/status_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/support/http_request_mock.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/views/status_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/oauth/oauth_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge
diff --cc
test/support/http_request_mock.ex
Simple merge
diff --cc
test/web/mastodon_api/views/status_view_test.exs
Simple merge
diff --cc
test/web/oauth/oauth_controller_test.exs
Simple merge
projects / akkoma / commitdiff