Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

08bc3167

Commit 08bc3167 authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'mastodon-notification-endpoints' into 'develop'

MastoAPI: Add notification endpoints get, clear and dismiss.

Closes #42

See merge request pleroma/pleroma!13

parents 87dee390 e6a78c6e

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/notification.ex 31 additions, 0 deletions

lib/pleroma/notification.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 48 additions, 17 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex 3 additions, 0 deletions

lib/pleroma/web/router.ex
test/notification_test.exs 61 additions, 0 deletions

test/notification_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs 70 additions, 1 deletion

test/web/mastodon_api/mastodon_api_controller_test.exs

with 213 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment