Maxim Filippov
|
5869a43fe7
|
Fix tests
|
5 years ago |
|
Maxim Filippov
|
b62be2564c
|
Merge branch 'develop' into feature/admin-api-render-whole-status
|
5 years ago |
|
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
5 years ago |
|
Maxim Filippov
|
2b341627da
|
Admin API: Render whole status in grouped reports
|
5 years ago |
|
Maxim Filippov
|
b88dbc17c8
|
Fix tests
|
5 years ago |
|
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
5 years ago |
|
Maxim Filippov
|
114930b5fd
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
5 years ago |
|
Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
5 years ago |
|
feld
|
1afeaf82fa
|
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
|
5 years ago |
|
Alexander
|
6a4201e0b4
|
fix for migrate task
|
5 years ago |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
Maxim Filippov
|
f171095960
|
Grouped reports with status data baked in
|
5 years ago |
|
Maxim Filippov
|
2cbfa256fd
|
Merge branch 'develop' into feature/multiple-users-force-password-reset
|
5 years ago |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
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 |
|
Maxim Filippov
|
7aceaa517b
|
Admin API: Reports, grouped by status
|
5 years ago |
|
Maxim Filippov
|
8dcc2f9f5e
|
Admin API: Allow changing the state of multiple reports at once
|
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 |
|
Sergey Suprunenko
|
ff55e3c16f
|
Create mentions only for explicitly mentioned users
|
5 years ago |
|
feld
|
93a0eeab16
|
Add license/copyright to all project files
|
5 years ago |
|
Eugenij
|
ab50c6b3ca
|
Add fallback value to the admin report view.
This is to avoid 500 error when the reported user no longer exists
in the database.
|
5 years ago |
|
Maxim Filippov
|
90927e6a9a
|
Kowalski, analysis!
|
5 years ago |
|
Maxim Filippov
|
452ca5250d
|
Merge admin and mastodon user views for reports
|
5 years ago |
|
Alex S
|
982cad0268
|
support for config groups
|
5 years ago |
|
Alex S
|
410add1c30
|
support for tuples with more than 2 values
|
5 years ago |
|
Alex S
|
f0fccb7578
|
fix for int and modules
|
5 years ago |
|
Alexander Strizhakov
|
32320c1ee9
|
Fixes for dynamic configuration
|
5 years ago |
|
rinpatch
|
bf6aa6f1a8
|
Fix report content stopping to be nullable
|
5 years ago |
|
rinpatch
|
44de34d170
|
Credo fixes
|
5 years ago |
|
rinpatch
|
e943905bd7
|
Add tests for report view
|
5 years ago |
|
Alexander Strizhakov
|
c2ca1f22a2
|
it is changed in compile time
we can't change module attributes and endpoint settings in runtime
|
5 years ago |
|
Sachin Joshi
|
e394fc2eef
|
fix the flaky test for users creation by admin
|
5 years ago |
|
Sachin Joshi
|
ad5263c647
|
Merge remote-tracking branch 'upstream/develop' into admin-create-users
|
5 years ago |
|
Sachin Joshi
|
5534d4c676
|
make bulk user creation from admin works as a transaction
|
5 years ago |
|
Maksim
|
db94294dfb
|
[#936] fix tests
|
5 years ago |
|
Aaron Tinio
|
f76268135c
|
Fix failing test
|
5 years ago |
|
Sachin Joshi
|
5c028b8f92
|
user creation admin api will create multiple users
|
5 years ago |
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
5 years ago |
|
Sachin Joshi
|
f01f995816
|
make url uniform in admin api
|
5 years ago |
|
Alexander Strizhakov
|
bfeb33e951
|
Merge develop
Merge conflict in lib/pleroma/activity.ex
|
5 years ago |
|
Egor
|
b9cdf6d3b9
|
Use `User.get_cached*` everywhere
|
5 years ago |
|
Alex S
|
c5d0fffeaf
|
naming fix
|
6 years ago |
|
Alex S
|
fe511a6c65
|
Merge branch 'develop' into feature/788-separate-email-addresses
|
6 years ago |
|
Alex S
|
fe13a1d78c
|
adding notify_email setting for trigger emails
|
6 years ago |
|
Ivan Tashkinov
|
44829d9181
|
AdminApiControllerTest unused variables fix.
|
6 years ago |
|
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
6 years ago |
|
Alex S
|
b810aac117
|
added docs to docs/api/admin_api.md
code style and little renamings
|
6 years ago |
|
Alex S
|
dcc54f8cfa
|
admin api endpoints for invites
|
6 years ago |
|
Mark Felder
|
fac76bfa35
|
We actually want the user id not nickname in the test...
|
6 years ago |
|
Mark Felder
|
c746087f57
|
Also remove Repo functions in the tests
|
6 years ago |
|
Roger Braun
|
7895ee37fa
|
Add user following / unfollowing to the admin api.
|
6 years ago |
|
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
|
eugenijm
|
10c81fc902
|
Add user show endpoint for Pleroma admin API
|
6 years ago |
