Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
5 years ago |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
Maxim Filippov
|
7258db023e
|
Support old flag format
|
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 |
|
lain
|
556da92902
|
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity
See merge request pleroma/pleroma!1849
|
5 years ago |
|
Maxim Filippov
|
743b622b7b
|
Force password reset for multiple users
|
5 years ago |
|
Maxim Filippov
|
d75934b0d0
|
Undo dialyzer fix
|
5 years ago |
|
Maxim Filippov
|
ced9f92327
|
Fix count
|
5 years ago |
|
Maxim Filippov
|
6f9d3d30fa
|
AdminAPI: Omit relay user from users list
|
5 years ago |
|
Maxim Filippov
|
59a149c69a
|
Fix "the call ... will never return" warning
|
5 years ago |
|
Maxim Filippov
|
d56bc62275
|
Fix report parsing
|
5 years ago |
|
Maxim Filippov
|
791bcfd90f
|
Merge branch 'develop' into feature/store-statuses-data-inside-flag
|
5 years ago |
|
Maxim Filippov
|
b08b1d5d91
|
Store status data inside Flag activity
|
5 years ago |
|
Ivan Tashkinov
|
ee04fbc35a
|
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.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
|
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
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
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 |
|
Ivan Tashkinov
|
64095961fe
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
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 |
|
kaniini
|
a39e065916
|
Merge branch 'feature/return-link-for-password-reset' into 'develop'
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
|
5 years ago |
|
kaniini
|
48a82c4609
|
Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
|
5 years ago |
|
Maxim Filippov
|
60cbea5bb2
|
Allow activities pagination via limit/offset
|
5 years ago |
|
Egor Kislitsyn
|
209395c7e6
|
Add User.change_info/2 and User.update_info/2
|
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 |
|
Ivan Tashkinov
|
6f67aed3ac
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
|
5 years ago |
|
Ekaterina Vaartis
|
d51e5e447e
|
Move emoji reloading to admin api
|
5 years ago |
|
Maxim Filippov
|
384b7dd40d
|
Fix response
|
5 years ago |
|
Maxim Filippov
|
f89728ad95
|
Merge branch 'develop' into feature/return-link-for-password-reset
|
5 years ago |
|
Ivan Tashkinov
|
551f2fa59e
|
[#1234] Added changelog entry, removed admin OAuth scopes.
|
5 years ago |
|
Alex S
|
a18f1e7cd7
|
namings
|
5 years ago |
|
Alex S
|
2263c8b6b9
|
little fixes
|
5 years ago |
|
Alex S
|
4faf2b1555
|
post for creating invite tokens in admin api
|
5 years ago |
|
Maxim Filippov
|
f9dd121ad3
|
Admin API: Return link alongside with token on password reset
|
5 years ago |
|
Ivan Tashkinov
|
01c1078015
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
|
5 years ago |
|
Ivan Tashkinov
|
76068873db
|
[#1234] Defined admin OAuth scopes, refined other scopes. Added tests.
|
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
|
efbc2edba1
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
|
Ivan Tashkinov
|
e6f43a831b
|
[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
|
5 years ago |
|
Alex S
|
a1f2dfb10a
|
expanding regex sigils to use modifiers
|
5 years ago |
|
Maxim Filippov
|
736165c082
|
Reverse reports list
|
5 years ago |
|
Maxim Filippov
|
af746fa4a8
|
Return total for reports
|
5 years ago |
|
Maxim Filippov
|
9c96b17e16
|
Add pagination to logs
|
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
|
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 |
|
Alexander Strizhakov
|
de0f3b73dd
|
Admin fixes
|
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
|
a9459ff98f
|
Admin API: Endpoint for fetching latest user's statuses
|
5 years ago |
|
Alexander Strizhakov
|
846ad9a463
|
admin api configure changes
|
5 years ago |
|
Egor Kislitsyn
|
5104f65b69
|
Wrap error messages into gettext helpers
|
5 years ago |
|
feld
|
93a0eeab16
|
Add license/copyright to all project files
|
5 years ago |
|
Maxim Filippov
|
6c50fbcd14
|
Admin API: Allow querying user by ID
|
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
|
452ca5250d
|
Merge admin and mastodon user views for reports
|
5 years ago |
|
Alexander Strizhakov
|
c6705144a2
|
don't delete config settings on admin update
|
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 |
|
rinpatch
|
bf6aa6f1a8
|
Fix report content stopping to be nullable
|
5 years ago |
|
rinpatch
|
44de34d170
|
Credo fixes
|
5 years ago |
|
rinpatch
|
641bcaa44e
|
Sanitize HTML in ReportView
Closes #990
|
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
|
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 |
|
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 |
|
Alexander Strizhakov
|
a2be420f94
|
differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
|
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 |
|
lambda
|
184ae60b21
|
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
9c1b36856b
|
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
1791ee8ec4
|
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
|
6 years ago |
|
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
6 years ago |
|
Alex S
|
56c75aec12
|
credo fix
|
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
|
b5a2d384f7
|
Redundant Repo.get_by usage was recently removed from the codebase
|
6 years ago |
