Maxim Filippov
|
2cbfa256fd
|
Merge branch 'develop' into feature/multiple-users-force-password-reset
|
5 years ago |
Maxim Filippov
|
743b622b7b
|
Force password reset for multiple users
|
5 years ago |
Maxim Filippov
|
6f9d3d30fa
|
AdminAPI: Omit relay user from users list
|
5 years ago |
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
5 years ago |
Egor Kislitsyn
|
c6fba62666
|
Fix Relay
|
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 |
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
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
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
5 years ago |
Maxim Filippov
|
cc6875b582
|
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
|
5 years ago |
Maxim Filippov
|
aaa4252f41
|
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
|
5 years ago |
Maxim Filippov
|
f5104f36bb
|
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
|
5 years ago |
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
5 years ago |
Egor Kislitsyn
|
e7aef27c00
|
Fix merge
|
5 years ago |
Egor Kislitsyn
|
98d1347a4e
|
Extract status actions from `MastodonAPIController` into `StatusController`
|
5 years ago |
Maxim Filippov
|
e7836adf21
|
Merge branch 'develop' into feature/moderation-log-filters
|
5 years ago |
Maxim Filippov
|
5e9759cd7d
|
Merge branch 'develop' into feature/return-link-for-password-reset
|
5 years ago |
kaniini
|
29dd8ab9c0
|
Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
|
5 years ago |
Steven Fuchs
|
e1d2d69c87
|
Clean up views
|
5 years ago |
Maxim Filippov
|
02bbcd6180
|
Merge branch 'develop' into feature/return-link-for-password-reset
|
5 years ago |
Maxim Filippov
|
72a01f1350
|
Use router helper to generate reset password link
|
5 years ago |
Maxim Filippov
|
6f25668215
|
Admin API: Add ability to force user's password reset
|
5 years ago |
rinpatch
|
b0ec82d24a
|
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
|
5 years ago |
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
5 years ago |
Alex S
|
4faf2b1555
|
post for creating invite tokens in admin api
|
5 years ago |
Maxim Filippov
|
df15ed13d1
|
Merge branch 'develop' into feature/moderation-log-filters
|
5 years ago |
Maxim Filippov
|
219dca1b00
|
Merge branch 'develop' into feature/return-total-for-reports
|
5 years ago |
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
5 years ago |
Alex S
|
a1f2dfb10a
|
expanding regex sigils to use modifiers
|
5 years ago |
Maxim Filippov
|
af746fa4a8
|
Return total for reports
|
5 years ago |
Maxim Filippov
|
6c2fd1b78b
|
Fix tests
|
5 years ago |
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
5 years ago |
Maxim Filippov
|
f182f0f6bd
|
Add ability to search moderation logs
|
5 years ago |
Maxim Filippov
|
5e4fde1d3d
|
Filter logs by date
|
5 years ago |
Maxim Filippov
|
c338224c93
|
Fix sporadic test
|
5 years ago |
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
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 |
Ivan Tashkinov
|
71700ea6d4
|
[#1149] Updated docs & tests.
|
5 years ago |
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
5 years ago |
Alexander Strizhakov
|
de0f3b73dd
|
Admin fixes
|
5 years ago |
Egor Kislitsyn
|
f98235f2ad
|
Clean up tests output
|
5 years ago |
Alexander Strizhakov
|
51b3b6d816
|
Admin changes
|
5 years ago |
Maxim Filippov
|
f46805bb40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
5 years ago |
Maxim Filippov
|
03471151d6
|
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
|
5 years ago |
Alexander Strizhakov
|
5e72554f3c
|
Admin config fix
|
5 years ago |
Sergey Suprunenko
|
05b5af8075
|
Add tests for users tasks and PleromaAuthenticator
|
5 years ago |
Maxim Filippov
|
9570a5be40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
5 years ago |
Alex S
|
c66044b923
|
atom keys with leading :
|
5 years ago |
Maxim Filippov
|
a9459ff98f
|
Admin API: Endpoint for fetching latest user's statuses
|
5 years ago |
Alexander Strizhakov
|
846ad9a463
|
admin api configure changes
|
5 years ago |