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

bc9e5e6b

Commit bc9e5e6b authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'

ActivityPub C2S oauth endpoints

See merge request pleroma/pleroma!821

parents 1ef47418 64620d89

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/activity_pub/views/user_view.ex 23 additions, 6 deletions

lib/pleroma/web/activity_pub/views/user_view.ex
lib/pleroma/web/router.ex 1 addition, 1 deletion

lib/pleroma/web/router.ex
priv/static/schemas/litepub-0.1.jsonld 5 additions, 1 deletion

priv/static/schemas/litepub-0.1.jsonld
test/web/activity_pub/views/user_view_test.exs 39 additions, 0 deletions

test/web/activity_pub/views/user_view_test.exs

with 68 additions and 8 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