Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

fd697cf2

Commit fd697cf2 authored 5 years ago by feld

Downloads
- Plain Diff

Merge branch 'issue/1411' into 'develop'

[#1411] /api/v1/favourites: added sorting for activites by adds to favorites

See merge request pleroma/pleroma!1991

parents 92b4a1aa 08670644

Branches

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
lib/pleroma/object.ex 17 additions, 0 deletions

lib/pleroma/object.ex
lib/pleroma/pagination.ex 54 additions, 34 deletions

lib/pleroma/pagination.ex
lib/pleroma/web/activity_pub/activity_pub.ex 19 additions, 0 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex 4 additions, 8 deletions

...pleroma/web/mastodon_api/controllers/status_controller.ex
test/web/activity_pub/activity_pub_test.exs 32 additions, 0 deletions

test/web/activity_pub/activity_pub_test.exs

with 127 additions and 42 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