Mark Felder
|
05da5f5cca
|
Update Copyrights
|
5 years ago |
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
5 years ago |
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
5 years ago |
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
5 years ago |
Maxim Filippov
|
452ca5250d
|
Merge admin and mastodon user views for reports
|
5 years ago |
Sachin Joshi
|
5534d4c676
|
make bulk user creation from admin works as a transaction
|
5 years ago |
Sachin Joshi
|
5c028b8f92
|
user creation admin api will create multiple users
|
5 years ago |
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
6 years ago |
Alex S
|
dcc54f8cfa
|
admin api endpoints for invites
|
6 years ago |
kaniini
|
59333f2d56
|
Merge branch 'admin-api-account-view-namespace' into 'develop'
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
|
6 years ago |
Haelwenn (lanodan) Monnier
|
cc0f2f8ba3
|
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
|
6 years ago |