projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
87dee39
e6a78c6
)
Merge branch 'mastodon-notification-endpoints' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Sun, 12 Nov 2017 11:08:06 +0000
(11:08 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Sun, 12 Nov 2017 11:08:06 +0000
(11:08 +0000)
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge