28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
f7e59c28ed
Change user.approval_pending field to user.is_approved
4 years ago
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
20af025c65
AdminAPI: return user email
4 years ago
9f5f7dc9f9
Fixed User.is_discoverable attribute rendering in Admin API User view.
4 years ago
9968b7efed
Change user.locked field to user.is_locked
4 years ago
1f8c32b773
adding actor type in user show
4 years ago
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
4 years ago
b750129da1
AdminAPI: Return `approval_pending` with users
4 years ago
a1570ba6ad
AdminAPI: Return `registration_reason` with users
4 years ago
3dd1de61a7
Add `url` field to AdminAPI.AccountView
4 years ago
fca48154a2
Add AdminAPI.InviteView
4 years ago
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
4 years ago
14a49a0483
[ #2456 ] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
4 years ago
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
8176ca9e40
static_fe: Sanitize HTML in users
5 years ago
05da5f5cca
Update Copyrights
5 years ago
46eb160135
AdminAPI: Confirm user account, resend confirmation email
5 years ago
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
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
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
452ca5250d
Merge admin and mastodon user views for reports
5 years ago
5534d4c676
make bulk user creation from admin works as a transaction
5 years ago
5c028b8f92
user creation admin api will create multiple users
5 years ago
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
dcc54f8cfa
admin api endpoints for invites
6 years ago
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
6 years ago
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
Mark Felder