lain
|
da550be066
|
Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
|
4 years ago |
Alexander Strizhakov
|
712055612f
|
don't run tests which change env in async
|
4 years ago |
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
4 years ago |
Stephanie Wilde-Hobbs
|
a2fcfc78c9
|
Filter config descriptions by config whitelist
|
4 years ago |
Stephanie Wilde-Hobbs
|
620247a015
|
Add database configuration whitelist
|
4 years ago |
Roman Chvanikov
|
cbe383ae83
|
Update stats admin endpoint
|
4 years ago |
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
4 years ago |
rinpatch
|
473b0d9f3d
|
Merge branch 'feature/delete-validator' into 'develop'
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
|
4 years ago |
lain
|
c3f1ce80eb
|
Merge branch 'fix/1726-user-pagination' into 'develop'
Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452
|
4 years ago |
Alexander Strizhakov
|
e7d8ab8303
|
admin_api fetch status by id
|
4 years ago |
lain
|
6c337489f4
|
Various testing fixes in relation to user deletion.
|
4 years ago |
lain
|
6fb96f64c1
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
|
4 years ago |
Alexander Strizhakov
|
aea781cbd8
|
credo fix
|
4 years ago |
lain
|
1ead5f49b8
|
AdminApiController: Use common pipeline for user deletion.
|
4 years ago |
lain
|
ebbd9c7f36
|
AdminAPIController: Refactor.
|
4 years ago |
Alexander Strizhakov
|
ecf37b46d2
|
pagination fix for service users filters
|
4 years ago |
Egor Kislitsyn
|
560f2c1979
|
Add OpenAPI spec for ReportController
|
4 years ago |
Haelwenn
|
a17bfb5fab
|
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
|
5 years ago |
Alexander Strizhakov
|
72ef6cc4f2
|
added need_reboot endpoint to admin api
|
5 years ago |
Alexander Strizhakov
|
a050f3e015
|
fix for logger configuration through admin-fe
|
5 years ago |
lain
|
b87b798ca1
|
Merge branch 'fix/1658-invite-send' into 'develop'
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
|
5 years ago |
Alexander Strizhakov
|
9795ff5b01
|
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
|
5 years ago |
Alexander Strizhakov
|
365c34a7a9
|
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
|
5 years ago |
Alexander Strizhakov
|
2d64500a9d
|
error improvement for email_invite endpoint
|
5 years ago |
feld
|
ef7d2b0f11
|
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
|
5 years ago |
Alexander Strizhakov
|
b607ae1a1c
|
removing grouped reports admin api endpoint
|
5 years ago |
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
5 years ago |
lain
|
1d75d0ed7a
|
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
|
5 years ago |
Alexander Strizhakov
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
5 years ago |
Alexander Strizhakov
|
9bae9b1b1b
|
Merge branch 'develop' into gun
|
5 years ago |
Ivan Tashkinov
|
1c05f539aa
|
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
|
5 years ago |
Ivan Tashkinov
|
ec3719f539
|
Improved in-test config management functions.
|
5 years ago |
eugenijm
|
13cce9c0de
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
|
5 years ago |
eugenijm
|
d198e7fa2a
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
|
5 years ago |
Alexander Strizhakov
|
f0651730bd
|
Merge branch 'develop' into gun
|
5 years ago |
feld
|
802b991814
|
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
|
5 years ago |
Alexander Strizhakov
|
426f5ee48a
|
tesla adapter can't be changed in adminFE
|
5 years ago |
Alexander Strizhakov
|
b2eb1124d1
|
Merge branch 'develop' into gun
|
5 years ago |
eugenijm
|
ad22e94f33
|
Exclude private and direct statuses visible to the admin when using godmode
|
5 years ago |
lain
|
f1750b4658
|
Admin API tests: Fix wrong test.
|
5 years ago |
Mark Felder
|
4427161ca3
|
Merge branch 'develop' into gun
|
5 years ago |
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
5 years ago |
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
5 years ago |
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
5 years ago |
Alexander Strizhakov
|
814b275af7
|
Merge branch 'develop' into gun
|
5 years ago |
feld
|
f2216287a7
|
Merge branch 'admin-status-list' into 'develop'
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
|
5 years ago |
eugenijm
|
4ab07cf0d5
|
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
|
5 years ago |
eugenijm
|
e2a6a40367
|
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
|
5 years ago |
eugenijm
|
7ad5c51f23
|
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
|
5 years ago |
Alexander Strizhakov
|
13918cb545
|
Merge branch 'develop' into gun
|
5 years ago |
Mark Felder
|
cf94349287
|
Merge branch 'develop' into gun
|
5 years ago |
Ivan Tashkinov
|
226f4d5ef9
|
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
|
5 years ago |
Alexander Strizhakov
|
514c899275
|
adding gun adapter
|
5 years ago |
Ivan Tashkinov
|
4f8c3462a8
|
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
|
5 years ago |
Alexander Strizhakov
|
dad23e3766
|
need_reboot flag
|
5 years ago |
Alexander Strizhakov
|
c85aa6e87f
|
removing confusing error
|
5 years ago |
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
5 years ago |
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
5 years ago |
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
5 years ago |
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
5 years ago |
Alexander Strizhakov
|
dcae5914d1
|
fix for db key
|
5 years ago |
Ivan Tashkinov
|
ca3b4de2c9
|
[#1521] AdminApiControllerTest: fixed create report test (OAuth).
|
5 years ago |
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
5 years ago |
lain
|
c814f22030
|
Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
|
5 years ago |
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
5 years ago |
Alexander Strizhakov
|
efb8ef5abe
|
releases support
|
5 years ago |
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
5 years ago |
Alexander Strizhakov
|
89e93fb33f
|
return db key on update requests
|
5 years ago |
Alexander Strizhakov
|
7676ed8239
|
some clean up
|
5 years ago |
Alexander Strizhakov
|
60ba2339a2
|
saving to DB only added by user settings
|
5 years ago |
Alexander Strizhakov
|
29155137fd
|
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
|
5 years ago |
Alexander Strizhakov
|
59ba5c80b9
|
little cleanup
|
5 years ago |
Alexander Strizhakov
|
1630ecaa20
|
Merge branch 'develop' into admin-be
|
5 years ago |
Alexander Strizhakov
|
d933fd3d61
|
more renamings
|
5 years ago |
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
5 years ago |
Alexander Strizhakov
|
88a16bb9fc
|
deep merge in config update
|
5 years ago |
Alexander
|
c841174de8
|
flag for delete fix
|
5 years ago |
Alexander
|
0b02040327
|
little fixes and typos fix
|
5 years ago |
Alexander
|
9c1f3bfeff
|
fixes for logger backends
|
5 years ago |
Alexander
|
063ab6d911
|
logger backends fix
|
5 years ago |
Alexander
|
583cee4607
|
parsing proxy url setting
|
5 years ago |
Alexander
|
fea734ca70
|
errors on endpoints
|
5 years ago |
Alexander
|
5cacb988b9
|
partially settings update
|
5 years ago |
Alexander
|
0656816c77
|
tests for setttings without an explicit key
|
5 years ago |
Alex S
|
2753285b77
|
config editing through database
|
5 years ago |
Maksim Pechnikov
|
385356aad0
|
fix oauth scopes for AdminApi#reports_update
|
5 years ago |
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
5 years ago |
Maxim Filippov
|
3ecf131511
|
Merge branch 'develop' into feature/report-notes
|
5 years ago |
Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Maxim Filippov
|
a7f77785c2
|
Implement report notes destruction
|
5 years ago |
Ivan Tashkinov
|
1770602747
|
[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
|
5 years ago |
Ivan Tashkinov
|
40e1817f70
|
[#1427] Fixes / improvements of admin scopes support. Added tests.
|
5 years ago |
Maxim Filippov
|
08c89fd2b8
|
Fix incorrect report count
|
5 years ago |
Ivan Tashkinov
|
13926537b6
|
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
|
5 years ago |
Ivan Tashkinov
|
af42c00cff
|
[#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
|
5 years ago |
feld
|
d0bd4348b3
|
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
|
5 years ago |
Maxim Filippov
|
4453a9cb73
|
Add failing test, which exposes a bug
|
5 years ago |
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
5 years ago |
Egor Kislitsyn
|
c4b468a95b
|
Cleanup tests output
|
5 years ago |
Maxim Filippov
|
fcabcab443
|
Fetch account from report, not from status (it might be deleted)
|
5 years ago |