Commit Graph

5015 Commits (484ba5d062d93fd0cf4841e7743724928af5a2d9)

Author SHA1 Message Date
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
Alex Gleason 30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
feld ecd1ef8cb5 Merge branch 'fix/2302-report-duplicates' into 'develop'
4 years ago
lain 8532325d65 SearchController Test: Fix test.
4 years ago
lain 9a1e5f5d48 Search: Change search method based on detected pg version
4 years ago
feld 79a509ee61 Merge branch '2301-users-search-discoverability-fix' into 'develop'
4 years ago
feld cd1b4155d5 Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
4 years ago
Maksim Pechnikov 66f411fba0 added subject actor to moderation log
4 years ago
Ivan Tashkinov b27d8f7437 Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
4 years ago
lain 5e04f4156c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Ivan Tashkinov e164c37139 [#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
4 years ago
Haelwenn c8d11c3064 Merge branch '2317-old-reset-tokens' into 'develop'
4 years ago
lain 783fa797bb SearchController Test: Fix test
4 years ago
lain 81b6f02a5e Search Test: linting
4 years ago
lain a60242464e Search: Add option to search with the websearch function
4 years ago
Ivan Tashkinov fcad3e716a [#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.
4 years ago
Alexander Strizhakov 46dab37351
little fix
4 years ago
lain 11e0d5f9ac Password Resets: Don't accept tokens above a certain age.
4 years ago
Alexander Strizhakov 4aaffe3a10
log capture
4 years ago
Alexander Strizhakov be0b874e1d
fix for mastodon forwarded reports
4 years ago
Alexander Strizhakov a840aefda8
formatting
4 years ago
Alexander Strizhakov e2bf6b1f7e
fix for forwarded reports
4 years ago
minibikini 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions'
4 years ago
lain aae669d05e Merge branch 'fix/webpush-and-emojireact' into 'develop'
4 years ago
lain 6b32e1de23 Merge branch 'frontend-admin-api' into 'develop'
4 years ago
Maksim Pechnikov 9c5d1cb9ed fix tests
4 years ago
Mark Felder 415481a4d9 Add test for POST when push is disabled
4 years ago
Mark Felder 3eaa5335c9 Revert adding extra alert types here
4 years ago
Mark Felder d9732fb7d3 Fix incorrect test description
4 years ago
Mark Felder ff7a4b6aa2 Test that we ignore invalid subscription alert types separately.
4 years ago
Mark Felder 30f140e570 Ensure all supported push notification subscription alert types are tested
4 years ago
Mark Felder 499faa82f6 Synchronize reaction notification text with PleromaFE's style
4 years ago
Mark Felder 67a6abd071 Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
Mark Felder 3ce11b830e Add capability for emoji reaction push notifications
4 years ago
lain bb9650f3c2 FrontendController: Return error on installation error.
4 years ago
feld d33b9e7b33 Merge branch 'remove/fedsockets' into 'develop'
4 years ago
Egor Kislitsyn f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
4 years ago
Egor Kislitsyn 79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
4 years ago
lain 61f86774d1 Merge branch 'chores/note-handling-move' into 'develop'
4 years ago
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain 81293e5aad ActivityPubController: Don't return local only objects
4 years ago
Mark Felder b1466661eb Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago
Maksim Pechnikov e4b202d905 added test
4 years ago
Egor Kislitsyn fb41bd1a85 Hide reactions from muted and blocked users
4 years ago
Maksim Pechnikov e1d25bad0c fix tests
4 years ago
Alex Gleason 9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
Haelwenn 28da36975d Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier e2f573d68b
pleroma.instance: Fix Exiftool module name
4 years ago
Maksim Pechnikov 36ec604521 added test
4 years ago
lain 0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
4 years ago
Ilja 70e4b86250 Make notifs view work for reports
4 years ago
rinpatch 6ca709816f Fix object spoofing vulnerability in attachments
4 years ago
Haelwenn 99bc175f02 Merge branch 'title-injection-change' into 'develop'
4 years ago
Mark Felder 966663c3f8 Fix tests for other attachment types
4 years ago
Mark Felder 2254e5e595 Render blurhashes in Mastodon API
4 years ago
Mark Felder 6fd72e9e85 Ingest blurhash for attachments if they were federated
4 years ago
Egor Kislitsyn d26a449396
Change endpoint path
4 years ago
Egor Kislitsyn 435bf1f945
Remove FrontendInstallerWorker
4 years ago
lain 631def2df2 RedirectController: Don't replace title, but inject into the meta
4 years ago
Egor Kislitsyn 08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn 0118ccb53c
Add `local` visibility
4 years ago
feld 3cd7ea693f Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
4 years ago
Alexander Strizhakov 8d218ebaf5
Moving some background jobs into simple tasks
4 years ago
Alexander Strizhakov f97f24b067
making credo happy and test fix
4 years ago
Alexander Strizhakov 485697d96c
config descriptions for custom MRF policies
4 years ago
lain 88f6b61a5e Merge branch '2260-wrong-report-link' into 'develop'
4 years ago
Alexander Strizhakov 0c68b9ac13
escaping summary and other fields in xml templates
4 years ago
rinpatch cc45c69fff Remove release_env
4 years ago
Haelwenn (lanodan) Monnier e010bb292b
NoteHandlingTest: Poison → Jason
4 years ago
Haelwenn (lanodan) Monnier fa1f5d4442
Move TransmogrifierTest for Note to NoteHandlingTest
4 years ago
lain 6d850c46dc AdminEmail: Use AP id as user url.
4 years ago
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain 4800ee656b Merge branch 'features/federation-status' into 'develop'
4 years ago
lain 5db4c823b2 Merge branch 'restrict-domain' into 'develop'
4 years ago
Ivan Tashkinov 73e66fd31f Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Haelwenn 9c09ea01aa Merge branch '2284-voters-count' into 'develop'
4 years ago
lain 504a829edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
4 years ago
lain cb3cd3a761 TopicsTest: Small addition.
4 years ago
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
lain bc4d9c4ffc Merge branch 'hide-muted-chats' into 'develop'
4 years ago
Egor Kislitsyn ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
lain e46c95b826 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
4 years ago
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain 1cfc3278c0 Poll View: Always return `voters_count`.
4 years ago
lain c37118e6f2 Conversations: A few refactors
4 years ago
lain 91f6c32430 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
4 years ago
Mark Felder 53dd048590 Test the note is returned when fetching a single report
4 years ago
Egor Kislitsyn be52819a11
Hide chats from muted users
4 years ago
lain 24ce324973 Merge branch 'bugfix/poll_replies_count' into 'develop'
4 years ago
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api'
4 years ago
Haelwenn (lanodan) Monnier 4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
4 years ago
feld 38b481d112 Merge branch 'feature/account-export' into 'develop'
4 years ago
Ivan Tashkinov 04f6b48ac1 Auth subsystem refactoring and tweaks.
4 years ago
eugenijm 8e41baff40 Add idempotency_key to the chat_message entity.
4 years ago
Egor Kislitsyn a2a7a1f2ff
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn 1a98476f48 Remove unused aliases
4 years ago
Alibek Omarov 1042c30fa5 ConversationViewTest: fix test
4 years ago
Alibek Omarov 0552a08dfd ConversationControllerTest: fix test, fix formatting
4 years ago
Alibek Omarov 9b93eef715 ConversationView: fix last_status.account being empty, fix current user being included in group conversations
4 years ago
Alibek Omarov 630eb0f939 ConversationViewTest: fix test #2
4 years ago
Alibek Omarov 149589c842 ConversationViewTest: fix test
4 years ago
Alibek Omarov 390a12d4c8 ConversationControllerTest: fix test
4 years ago
minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop'
4 years ago
feld 1cce1bd729 Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
4 years ago
Egor Kislitsyn d83c2bd330
Add support for install via `file` and `build_url` params
4 years ago
Egor Kislitsyn fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn 8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
4 years ago
Ivan Tashkinov ba50dc05a8 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Mark Felder d2b140a525 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
4 years ago
Egor Kislitsyn 4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn 4f90077767
Fix warning
4 years ago
feld 1204aaa2e3 Merge branch 'feature/autofollowing' into 'develop'
4 years ago
Haelwenn d8d4bd15d0 Merge branch '2236-no-name' into 'develop'
4 years ago
feld 03a318af9a Merge branch 'develop' into 'feature/autofollowing'
4 years ago
Mark Felder f2b74f60f0 Merge branch 'develop' into feature/account-export
4 years ago
Maksim Pechnikov d28f72a55a FrontStatic plug: excluded invalid url
4 years ago
Mark Felder cbe41408e4 phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
4 years ago
minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Mark Felder 291189357b Merge branch 'develop' into feature/account-export
4 years ago
Mark Felder 9e54ef086b Merge branch 'develop' into feature/account-export
4 years ago
feld 5aff479951 Merge branch '1668-prometheus-access-restrictions' into 'develop'
4 years ago
feld e062329a17 Merge branch 'develop' into 'feature/autofollowing'
4 years ago
Egor Kislitsyn 03e306785b
Add an API endpoint to install a new frontend
4 years ago
lain 9542c5d0f4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
4 years ago
rinpatch df61071422 Merge branch '2242-nsfw-case' into 'develop'
4 years ago
lain 60e379ce0b User: Correctly handle whitespace names.
4 years ago
feld d6907e6e0c Merge branch 'chore/elixir-1.11' into 'develop'
4 years ago
lain 8d251096fe SideEffects: Correctly handle chat messages sent to yourself
4 years ago
Maksim Pechnikov ef627b9391 fix module name
4 years ago
Maksim Pechnikov add26817e3 update changelog
4 years ago
Maksim Pechnikov 44e5a57d1a admin api: added user filters by `actor_types`
4 years ago
Maksim Pechnikov 60663150b5 admin user search: added filter by `actor_type`
4 years ago
Maksim Pechnikov 46b420aa60 need_confirmed -> unconfirmed
4 years ago
Maksim Pechnikov cf4f393794 added AdminApi.UserController
4 years ago
Maksim Pechnikov 9ef46ce410 added 'unconfirmed' filter to admin/users
4 years ago
Egor Kislitsyn 034ac43f3a
Fix credo warnings
4 years ago
Egor Kislitsyn e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
4 years ago
Egor Kislitsyn c1976d5b19 Fix credo warnings
4 years ago
lain 39fd4d7639 Transmogrifier: Downcase incoming Hashtags
4 years ago
Egor Kislitsyn 98f32cf820
Fix tests
4 years ago
Egor Kislitsyn 76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn 18a91d85e5
Merge branch 'develop' into feature/local-only-scope
4 years ago
Haelwenn 0495a07dc7 Merge branch '2239-mute-fixes' into 'develop'
4 years ago
Ivan Tashkinov 524fb0e4c2 [#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
4 years ago
Ivan Tashkinov 9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Mark Felder 1b8fd7e65a Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
4 years ago
Haelwenn (lanodan) Monnier aafdc975bd
federation_status: Add ApiSpec
4 years ago
Haelwenn (lanodan) Monnier 3b5a7a6b14
federation_status: New endpoint showing unreachable instances
4 years ago
Mark Felder fb056ce05b Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Maksim Pechnikov 2030ffd490 fix test
4 years ago
Maksim Pechnikov 20e68b30f0 added generated `pleroma.env`
4 years ago
Egor Kislitsyn 2a475622ee
Add Pleroma.Constants.as_local_public/0
4 years ago
Egor Kislitsyn 4f79bbbc31
Add local-only statuses
4 years ago
Egor Kislitsyn 3985c1b450
Fix warnings
4 years ago
lain 7a2f100061 ActivityPub: Show own replies to muted users.
4 years ago
Mark Felder 1fb9452131 Merge branch 'develop' into feature/account-export
4 years ago
Alex Gleason 83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
feld 2013705690 Merge branch 'feature/gen-magic' into 'develop'
4 years ago
Haelwenn 9a85ec0da0 Merge branch 'refactor/locked_user_field' into 'develop'
4 years ago
Mark Felder ed61002815 Undo API breaking changes
4 years ago
Mark Felder b001237b79 Finish undoing API breakage
4 years ago
Mark Felder 3242cfef20 Undo API breaking changes
4 years ago
Alex Gleason dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
4 years ago
Alex Gleason 755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Alex Gleason 7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Alex Gleason c3112fd13a
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
Mark Felder 8b20c4d275 Missed tests
4 years ago
Egor Kislitsyn 6734abcbd4
Add pagination for Mutes
4 years ago
Haelwenn (lanodan) Monnier f5d8af1db1
Move Consistency.FileLocation to ./test
4 years ago
Mark Felder 09be8cb336 Credo
4 years ago
Egor Kislitsyn 33f4f39b1c
Add pagination for Blocks
4 years ago
Mark Felder 40f3cdc030 JPEG content_type must be image/jpeg
4 years ago
Mark Felder b738f70953 Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder 64553ebae2 Merge branch 'develop' into chore/elixir-1.11
4 years ago
Mark Felder 409f694e4f Merge branch 'develop' into refactor/locked_user_field
4 years ago
Mark Felder 4ead0d564f Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Mark Felder 8bacdc3680 Change user.discoverable field to user.is_discoverable
4 years ago
Mark Felder 9968b7efed Change user.locked field to user.is_locked
4 years ago
Alexander Strizhakov 4c4ea9a348
changes after rebase
4 years ago
Alexander Strizhakov 5f2071c458
changes after rebase
4 years ago
Alexander Strizhakov bb111465a1
credo fix after rebase
4 years ago
Alexander Strizhakov 7f5dbb0201
changes after rebase
4 years ago
Alexander Strizhakov b081080dd9
fixes after rebase
4 years ago
Alexander Strizhakov f679486540
rebase
4 years ago
Alexander Strizhakov c4c5caedd8
changes after rebase
4 years ago
Alexander Strizhakov c8418e2d1f
fix after rebase
4 years ago
Alexander Strizhakov b720ad2264
files consistency after rebase
4 years ago
Alexander Strizhakov c5efded5fd
files consistency for new files
4 years ago
Alexander Strizhakov 207211a2b3
update files consistency after rebase
4 years ago
Alexander Strizhakov e33782455d
updates after rebase
4 years ago
Alexander Strizhakov 9f4fe5485b
alias alphabetically order
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 66e0b0065b
Cache plug module name
4 years ago
Alexander Strizhakov c6baa811d6
EnsureAuthenticatedPlug module name
4 years ago
Alexander Strizhakov 011525a3d1
EnsurePublicOrAuthenticatedPlug 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 8c993c5f63
FederatingPlug 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 a6d8cef33e
OAuthScopesPlug module name
4 years ago
Alexander Strizhakov 15772fda57
PlugHelper module name
4 years ago
Alexander Strizhakov 4b1863ca4e
RateLimiter module name
4 years ago
Alexander Strizhakov 3be8ab5103
RemoteIp module name
4 years ago
Alexander Strizhakov 4b4c0eef36
SessionAuthenticationPlug module name
4 years ago
Alexander Strizhakov 8249b75761
SetFormatPlug module name
4 years ago
Alexander Strizhakov c97c7d982f
SetLocalePlug module name
4 years ago
Alexander Strizhakov f7614d4718
SetUserSessionIdPlug 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
Alexander Strizhakov 7acf09beb8
more tests
4 years ago
Alexander Strizhakov 103f3dcb9e
rich media parser ttl files consistency
4 years ago
Alexander Strizhakov 7dffaef479
tests consistency
4 years ago
Alexander Strizhakov 6bf85440b3
mix tasks consistency
4 years ago
Alex Gleason 83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932
4 years ago
Alex Gleason cb29769a22
Make User.confirm/1 and User.approve/1 idempotent
4 years ago
Alex Gleason 6ebec50df6
Refactor User.confirm/1, add more tests
4 years ago
Alex Gleason 9ddc292ca8
TwitterAPI: test pending approval user email
4 years ago
feld 03855f9789 Merge branch 'improve/instance-gen' into 'develop'
4 years ago
Mark Felder 8539e386c3 Add missing Copyright headers
4 years ago
Mark Felder 6c61ef14c3 Support enabling upload filters during instance gen
4 years ago
Alex Gleason 521e965884
Registration tests
4 years ago
Alex Gleason 28005563f0
Send approval pending email during registration
4 years ago
Ivan Tashkinov 2498e569f1 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Ivan Tashkinov 89c595b772 [#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
4 years ago
Mark Felder 3ca98878d2 Deep link to the user account in AdminFE in account confirmation emails
4 years ago
Mark Felder 04b514c567 Merge branch 'develop' into feature/gen-magic
4 years ago
Alex Gleason 9c672ecbb5
Remote Timeline: add Streaming support
4 years ago
Alex Gleason 3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
4 years ago
Alex Gleason 77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Haelwenn 74be4de3f6 Merge branch 'fix/2209-remoteip' into 'develop'
4 years ago
Mark Felder a702f9fb5b Lint
4 years ago
Maksim 6ee20eb328 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim 8bfc5d9a0c Apply 1 suggestion(s) to 1 file(s)
4 years ago
feld d0eca5b125 Apply 2 suggestion(s) to 2 file(s)
4 years ago
Mark Felder 8156940a49 Compatibility with phoenix_pubsub 2.0.0
4 years ago
Mark Felder 570a406b7a use Phoenix.ConnTest is deprecated
4 years ago