projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b531e36
08c6aee
)
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
author
kaniini
<nenolod@gmail.com>
Sun, 3 Mar 2019 15:59:15 +0000
(15:59 +0000)
committer
kaniini
<nenolod@gmail.com>
Sun, 3 Mar 2019 15:59:15 +0000
(15:59 +0000)
Add pagination and search to users
See merge request pleroma/pleroma!873
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/views/user_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/user_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/views/user_view.ex
Simple merge
diff --cc
test/user_test.exs
Simple merge
projects / akkoma / commitdiff