6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
2020-07-23 15:08:30 +03:00
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.
2020-07-22 19:06:00 +03:00
b750129da1
AdminAPI: Return `approval_pending` with users
2020-07-14 13:47:05 -05:00
a1570ba6ad
AdminAPI: Return `registration_reason` with users
2020-07-14 13:08:39 -05:00
3dd1de61a7
Add `url` field to AdminAPI.AccountView
2020-06-09 16:02:42 +04:00
fca48154a2
Add AdminAPI.InviteView
2020-05-26 15:21:33 +04:00
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
14a49a0483
[ #2456 ] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
2020-05-09 18:05:44 +03:00
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
2020-03-16 20:42:37 +03:00
8176ca9e40
static_fe: Sanitize HTML in users
2020-03-15 20:44:04 +01:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
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
2019-10-20 20:43:18 +03:00
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
2019-08-24 16:04:19 +00:00
452ca5250d
Merge admin and mastodon user views for reports
2019-06-28 15:15:32 +03:00
5534d4c676
make bulk user creation from admin works as a transaction
2019-06-01 11:17:53 +05:45
5c028b8f92
user creation admin api will create multiple users
2019-05-17 12:21:58 +05:45
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
2019-04-08 16:01:28 +07:00
dcc54f8cfa
admin api endpoints for invites
2019-04-06 20:25:19 +07:00
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
2019-03-14 02:01:10 +00:00
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
2019-03-13 12:17:57 +01:00
Alex Gleason