Commit Graph

671 Commits

Author SHA1 Message Date
Alexander Strizhakov 99e4ed21b1
ExpectPublicOrAuthenticatedCheckPlug module name 2020-10-13 16:43:56 +03:00
Alexander Strizhakov 5cd7030076
IdempotencyPlug module name 2020-10-13 16:43:55 +03:00
Alexander Strizhakov e2332d92ce
LegacyAuthenticationPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov 96d320bdfe
OAuthPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov 4b4c0eef36
SessionAuthenticationPlug module name 2020-10-13 16:42:53 +03:00
Alexander Strizhakov f7614d4718
SetUserSessionIdPlug module name 2020-10-13 16:42:52 +03:00
Alexander Strizhakov d36c9e210a
StaticFEPlug module name 2020-10-13 16:42:52 +03:00
Alexander Strizhakov ebd6dd7c53
UserEnabledPlug module name 2020-10-13 16:42:51 +03:00
Alexander Strizhakov 61c609884c
UserFetcherPlug module name 2020-10-13 16:42:51 +03:00
Alexander Strizhakov 1d16cd0c3d
UserIsAdminPlug module name 2020-10-13 16:42:50 +03:00
Alexander Strizhakov 0374df1d12
other files consistency 2020-10-13 16:38:19 +03:00
Alexander Strizhakov 5d7ec00bed
fixes after rebase 2020-09-24 09:42:30 +03:00
Alexander Strizhakov 8c6ec4c111
pack routes change 2020-09-24 09:16:14 +03:00
Alexander Strizhakov 9b6d89ff8c
support for special chars in pack name 2020-09-24 09:12:37 +03:00
Maksim Pechnikov 72d2b34d3b Merge branch 'develop' into issue/1975 2020-09-22 21:42:10 +03:00
Maksim Pechnikov ed3bc53fa1 Merge branch 'develop' into issue/2099 2020-09-18 22:13:05 +03:00
Maksim Pechnikov 2ec0dcf001 Merge branch 'develop' into issue/2099 2020-09-18 07:08:37 +03:00
Ivan Tashkinov a428800405 Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
#	CHANGELOG.md
2020-09-17 22:22:59 +03:00
Ivan Tashkinov d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-17 17:14:20 +03:00
eugenijm 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API 2020-09-17 16:48:07 +03:00
Alex Gleason 9dd0b23da4
AdminAPI: show chat 2020-09-11 14:10:28 -05:00
Alex Gleason f13b52a703
AdminAPI: list messages in a chat 2020-09-11 14:10:19 -05:00
Alex Gleason fb0de07343
AdminAPI: list chats for a user 2020-09-11 14:10:05 -05:00
Alex Gleason b40a627ab0
AdminAPI: delete a chat message 2020-09-11 14:09:58 -05:00
Maksim Pechnikov 5ae56aafb2 added import mutes 2020-09-06 21:42:51 +03:00
Maksim Pechnikov 7794d7c694 added Pleroma.Web.PleromaAPI.EmojiFileController 2020-08-19 06:50:20 +03:00
Ivan Tashkinov 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
#	mix.lock
2020-08-07 09:38:05 +03:00
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
2020-07-19 20:05:37 +03:00
Alex Gleason 20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint 2020-07-14 18:02:44 -05:00
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
2020-07-08 03:25:30 +00:00
lain c8dd973af5 AccountController: Remove unused `update_?` routes.
These were not documented and are also not used anymore.
2020-07-07 16:53:20 +02:00
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
2020-07-02 16:36:54 +03:00
Egor Kislitsyn 67d92ac7b7
Remove `/statusnet/config` 2020-06-29 17:00:37 +04:00
Egor Kislitsyn 4a306720e8
Merge branch 'develop' into remove-twitter-api 2020-06-29 16:09:49 +04:00
feld 8288419686 Merge branch 'preload-data' into 'develop'
Preload data into index.html

Closes #1660

See merge request pleroma/pleroma!2381
2020-06-25 21:35:39 +00:00
Haelwenn (lanodan) Monnier 8f6ba4b22f
Add warning against parsing/reusing MastoFE settings blob 2020-06-22 23:45:29 +02:00
Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data 2020-06-12 16:52:52 -05:00
Maksim Pechnikov f9dcf15ecb added admin api for MediaProxy cache invalidation 2020-06-12 14:49:54 +03:00
lain 064c4f86f3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-09 09:36:07 +02:00
lain d192492658 Merge branch 'openapi/admin/relay' into 'develop'
Add OpenAPI spec for AdminAPI.RelayController

See merge request pleroma/pleroma!2579
2020-06-08 11:07:01 +00:00
lain 7d66dd180a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-08 10:18:10 +02:00
lain a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-05 16:53:56 +02:00
Haelwenn d74985af23 Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination

Closes #866 and #751

See merge request pleroma/pleroma!2491
2020-06-05 14:52:09 +00:00
minibikini b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay'
# Conflicts:
#   lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04 13:29:32 +00:00
Egor Kislitsyn 70f054b083
Merge branch 'develop' into openapi/admin/relay 2020-06-04 13:30:14 +04:00
Egor Kislitsyn b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config 2020-06-04 13:28:00 +04:00
stwf 29ae5bb771 preload data into index.html 2020-06-03 16:34:03 -04:00
lain b3407344d3 ChatController: Add function to mark single message as read. 2020-06-03 19:21:23 +02:00
Egor Kislitsyn 9d572f2f66
Move report actions to AdminAPI.ReportController 2020-06-03 19:17:04 +04:00
Egor Kislitsyn 68cb152a08
Merge branch 'develop' into openapi/admin/relay 2020-06-02 18:50:37 +04:00