git.squeep.com Git - akkoma/commit

author	Haelwenn <contact+git.pleroma.social@hacktivis.me>
	Fri, 5 Jun 2020 14:52:09 +0000 (14:52 +0000)
committer	rinpatch <rinpatch@sdf.org>
	Sun, 7 Jun 2020 21:58:31 +0000 (00:58 +0300)
commit	9396b2f8cf0fa26f6fb5e372112b394b74ae8a4e
tree	2a6f7a4d20811bb1a17afba56a40d4dba7885bb1	tree \| snapshot
parent	0186f56d932a441f106e35c86bfefe57c9ead64d	commit \| diff

Merge branch 'features/apc2s-pagination' into 'develop'

Fix AP C2S pagination

Closes #866 and #751

See merge request pleroma/pleroma!2491

Fork of https://akkoma.dev/AkkomaGang/akkoma.git

lib/pleroma/web/activity_pub/activity_pub_controller.ex		diff \| blob \| history
lib/pleroma/web/activity_pub/views/user_view.ex		diff \| blob \| history
lib/pleroma/web/controller_helper.ex		diff \| blob \| history
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex		diff \| blob \| history
lib/pleroma/web/router.ex		diff \| blob \| history
test/web/activity_pub/activity_pub_controller_test.exs		diff \| blob \| history
test/web/activity_pub/views/user_view_test.exs		diff \| blob \| history