projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e356cc
0dc8f3d
)
Merge branch 'features/apc2s-media-upload' into 'develop'
author
kaniini
<ariadne@dereferenced.org>
Mon, 30 Sep 2019 11:21:49 +0000
(11:21 +0000)
committer
kaniini
<ariadne@dereferenced.org>
Mon, 30 Sep 2019 11:21:49 +0000
(11:21 +0000)
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
1
2
lib/pleroma/web/activity_pub/activity_pub_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/views/user_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
priv/static/schemas/litepub-0.1.jsonld
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/ostatus/ostatus_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub_controller.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/views/user_view.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
priv/static/schemas/litepub-0.1.jsonld
Simple merge
diff --cc
test/web/activity_pub/activity_pub_controller_test.exs
Simple merge
diff --cc
test/web/ostatus/ostatus_controller_test.exs
Simple merge
projects / akkoma / commitdiff