feld
|
f1f773f2c7
|
Merge branch 'email-stub-in-verify-credentials' into 'develop'
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
|
4 years ago |
|
Ivan Tashkinov
|
60b4654038
|
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.
|
4 years ago |
|
Egor Kislitsyn
|
793fc77b16
|
Add active user count
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
c4439c630f
|
Bump Copyright to 2021
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
|
4 years ago |
|
Ivan Tashkinov
|
e9859b68fc
|
[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
|
4 years ago |
|
Ivan Tashkinov
|
12a5981cc3
|
Session token setting on token exchange. Auth-related refactoring.
|
4 years ago |
|
Ivan Tashkinov
|
489b12cde4
|
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
|
4 years ago |
|
Ivan Tashkinov
|
ccc2cf0e87
|
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
|
4 years ago |
|
Egor Kislitsyn
|
d26a449396
|
Change endpoint path
|
4 years ago |
|
Egor Kislitsyn
|
08cbd655d1
|
Merge branch 'develop' into frontend-admin-api
|
4 years ago |
|
Ivan Tashkinov
|
73e66fd31f
|
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
|
4 years ago |
|
lain
|
504a829edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
|
4 years ago |
|
minibikini
|
6163fbf553
|
Merge branch 'develop' into 'frontend-admin-api'
# Conflicts:
# lib/pleroma/web/router.ex
|
4 years ago |
|
Ivan Tashkinov
|
04f6b48ac1
|
Auth subsystem refactoring and tweaks.
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
|
4 years ago |
|
Egor Kislitsyn
|
d1698267a2
|
Fix credo warning
|
4 years ago |
|
Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
feld
|
1cce1bd729
|
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
[#2137] admin/users filters
See merge request pleroma/pleroma!3016
|
4 years ago |
|
Egor Kislitsyn
|
03e306785b
|
Add an API endpoint to install a new frontend
|
4 years ago |
|
Maksim Pechnikov
|
cf4f393794
|
added AdminApi.UserController
|
4 years ago |
|
Ivan Tashkinov
|
049ece1ef3
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
3b5a7a6b14
|
federation_status: New endpoint showing unreachable instances
|
4 years ago |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Alexander Strizhakov
|
3ef4e9d170
|
AdminSecretAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
c497558d43
|
AuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
c1777e7479
|
BasicAuthDecoderPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
c6baa811d6
|
EnsureAuthenticatedPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
8e301a4c37
|
EnsureUserKeyPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
d6cb1a3b46
|
ExpectAuthenticatedCheckPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
99e4ed21b1
|
ExpectPublicOrAuthenticatedCheckPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
5cd7030076
|
IdempotencyPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
e2332d92ce
|
LegacyAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
96d320bdfe
|
OAuthPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
4b4c0eef36
|
SessionAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
f7614d4718
|
SetUserSessionIdPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
d36c9e210a
|
StaticFEPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
ebd6dd7c53
|
UserEnabledPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
61c609884c
|
UserFetcherPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
1d16cd0c3d
|
UserIsAdminPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
0374df1d12
|
other files consistency
|
4 years ago |
|
Ivan Tashkinov
|
89c595b772
|
[#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
|
4 years ago |
|
Egor Kislitsyn
|
17562bf414
|
Move API endpoints to `/api/v1/pleroma/backups`
|
4 years ago |
|
Egor Kislitsyn
|
7c22c9afb4
|
Allow admins request user backups
|
4 years ago |
|
Egor Kislitsyn
|
2c73bfe122
|
Add API endpoints for Backups
|
4 years ago |
|
Ivan Tashkinov
|
6c2264af24
|
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
|
4 years ago |
|
Ivan Tashkinov
|
094edde7c4
|
[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
|
4 years ago |
|
Ivan Tashkinov
|
f6024252ae
|
[#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
|
4 years ago |
|
Alexander Strizhakov
|
5d7ec00bed
|
fixes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
8c6ec4c111
|
pack routes change
|
4 years ago |
|
Alexander Strizhakov
|
9b6d89ff8c
|
support for special chars in pack name
|
4 years ago |
|
Maksim Pechnikov
|
72d2b34d3b
|
Merge branch 'develop' into issue/1975
|
4 years ago |
|
Maksim Pechnikov
|
ed3bc53fa1
|
Merge branch 'develop' into issue/2099
|
4 years ago |
|
Maksim Pechnikov
|
2ec0dcf001
|
Merge branch 'develop' into issue/2099
|
4 years ago |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Ivan Tashkinov
|
d9fb5bc08a
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
|
4 years ago |
|
eugenijm
|
582ad5d4e1
|
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
|
4 years ago |
|
Alex Gleason
|
9dd0b23da4
|
AdminAPI: show chat
|
4 years ago |
|
Alex Gleason
|
f13b52a703
|
AdminAPI: list messages in a chat
|
4 years ago |
|
Alex Gleason
|
fb0de07343
|
AdminAPI: list chats for a user
|
4 years ago |
|
Alex Gleason
|
b40a627ab0
|
AdminAPI: delete a chat message
|
4 years ago |
|
Maksim Pechnikov
|
5ae56aafb2
|
added import mutes
|
4 years ago |
|
Maksim Pechnikov
|
7794d7c694
|
added Pleroma.Web.PleromaAPI.EmojiFileController
|
4 years ago |
|
Ivan Tashkinov
|
1298a2ea2c
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
|
4 years ago |
|
Ivan Tashkinov
|
bdf57b8ef4
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
|
4 years ago |
|
Alex Gleason
|
20d24741af
|
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
|
4 years ago |
|
Haelwenn
|
a8447c3803
|
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
|
4 years ago |
|
lain
|
c8dd973af5
|
AccountController: Remove unused `update_?` routes.
These were not documented and are also not used anymore.
|
4 years ago |
|
Ivan Tashkinov
|
61180ab6f4
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
|
4 years ago |
|
Egor Kislitsyn
|
67d92ac7b7
|
Remove `/statusnet/config`
|
4 years ago |
|
Egor Kislitsyn
|
4a306720e8
|
Merge branch 'develop' into remove-twitter-api
|
4 years ago |
|
feld
|
8288419686
|
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
8f6ba4b22f
|
Add warning against parsing/reusing MastoFE settings blob
|
4 years ago |
|
Mark Felder
|
26f710b9e3
|
Merge branch 'develop' into preload-data
|
4 years ago |
|
Maksim Pechnikov
|
f9dcf15ecb
|
added admin api for MediaProxy cache invalidation
|
4 years ago |
|
lain
|
064c4f86f3
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
d192492658
|
Merge branch 'openapi/admin/relay' into 'develop'
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
|
4 years ago |
|
lain
|
7d66dd180a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
a8ca030d85
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
Haelwenn
|
d74985af23
|
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
|
4 years ago |
|
minibikini
|
b57e4ad1ab
|
Merge branch 'develop' into 'openapi/admin/relay'
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
|
4 years ago |
|
Egor Kislitsyn
|
70f054b083
|
Merge branch 'develop' into openapi/admin/relay
|
4 years ago |
|
Egor Kislitsyn
|
b4d5bdd6f1
|
Merge branch 'develop' into openapi/admin/config
|
4 years ago |
|
stwf
|
29ae5bb771
|
preload data into index.html
|
4 years ago |
|
lain
|
b3407344d3
|
ChatController: Add function to mark single message as read.
|
4 years ago |
|
Egor Kislitsyn
|
9d572f2f66
|
Move report actions to AdminAPI.ReportController
|
4 years ago |
|
Egor Kislitsyn
|
68cb152a08
|
Merge branch 'develop' into openapi/admin/relay
|
4 years ago |
|
lain
|
5da38c15cd
|
Merge branch 'openapi/admin/oauth-apps' into 'develop'
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
|
4 years ago |
|
lain
|
022d975a39
|
Merge branch 'openapi/admin/invites' into 'develop'
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
|
4 years ago |
|
Egor Kislitsyn
|
6b84c62d4a
|
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
2c18830d0d
|
Bugfix: router: allow basic_auth for outbox
|
4 years ago |
|
Egor Kislitsyn
|
d1ee3527ef
|
Move config actions to AdminAPI.ConfigController
|
4 years ago |
|
Egor Kislitsyn
|
fca48154a2
|
Add AdminAPI.InviteView
|
4 years ago |
|
Egor Kislitsyn
|
95ebfb9190
|
Move invite actions to AdminAPI.InviteTokenController
|
4 years ago |
|
Egor Kislitsyn
|
0ba1f2631a
|
Add OpenAPI spec for AdminAPI.OAuthAppContoller
|
4 years ago |
|
Egor Kislitsyn
|
cbcd592300
|
Add OpenAPI spec for AdminAPI.RelayController
|
4 years ago |
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
ec470c4c77
|
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
|
4 years ago |
|
lain
|
355aa3bdc7
|
ActivityPubController: Add Mastodon activity compat route.
|
4 years ago |
|
lain
|
ca755f9a73
|
ActivityPubController: Add Mastodon compatibility route.
|
4 years ago |
|
lain
|
578ed3a37f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
f166316f50
|
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
|
4 years ago |
