projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4df71cd
9274cab
)
Merge branch 'fix/tusky-dm' into 'develop'
author
kaniini
<nenolod@gmail.com>
Fri, 25 Jan 2019 05:19:32 +0000
(
05:19
+0000)
committer
kaniini
<nenolod@gmail.com>
Fri, 25 Jan 2019 05:19:32 +0000
(
05:19
+0000)
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
1
2
lib/pleroma/notification.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/common_api/utils.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/views/activity_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/user_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/status_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/notification.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
lib/pleroma/web/common_api/utils.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/views/activity_view.ex
Simple merge
diff --cc
test/user_test.exs
Simple merge
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
diff --cc
test/web/mastodon_api/status_view_test.exs
Simple merge