Commit Graph

8062 Commits (caadde3b04cf4c6509cc0841a338503e646221a0)

Author SHA1 Message Date
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 8b90d62506 Search: Only skip ordering the rum index.
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 5e2ba57327 Activity search: Fix order of results
4 years ago
lain 11e0d5f9ac Password Resets: Don't accept tokens above a certain age.
4 years ago
Alexander Strizhakov 8a8c154b4e
test fixes
4 years ago
Alexander Strizhakov be0b874e1d
fix for mastodon forwarded reports
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
feld a1056aace1 Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
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
Maksim 25eb222bed Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder ccddedb504 Credo
4 years ago
Mark Felder 499faa82f6 Synchronize reaction notification text with PleromaFE's style
4 years ago
Mark Felder 5d0bc5e028 Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
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 83ec2f1384 Allow subscribing for pleroma:emoji_reaction push notifications
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
Mark Felder 97201f7e37 Need to start web_resp cache or mix task fails
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 79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
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
Maksim Pechnikov 1830b6aae5 added error messages for posix error code
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 2156de2fee Ingest blurhash field during transmogrification
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
Alexander Strizhakov 8da9f919f8
little changes for MRF config descriptions
4 years ago
Egor Kislitsyn af3f00292c
Fix formatting
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 efc27f6464
fix for adminFE
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
lain d77fd6b3d0 Merge branch 'fix/html-title-load' into 'develop'
4 years ago
Alexander Strizhakov 0c68b9ac13
escaping summary and other fields in xml templates
4 years ago
Sean King e4a21084f0 Fix title on load of Pleroma HTML
4 years ago
rinpatch cc45c69fff Remove release_env
4 years ago
lain 294628d981 Merge branch 'feature/expire-mutes' into 'develop'
4 years ago
lain 6d850c46dc AdminEmail: Use AP id as user url.
4 years ago
lain 7bbc328d66 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
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 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 92d252f364 Poll Schema: Update and fix.
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 7efc074ead Permit fetching individual reports with notes preloaded
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 9fbe9ef774 Merge branch 'tesla-get-to-pleroma' into 'develop'
4 years ago
Ekaterina Vaartis 8f00d90f91 Use Pleroma.HTTP instead of Tesla
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 d1698267a2
Fix credo warning
4 years ago
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Alibek Omarov d63ec02f31 ConversationView: 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 241bd061fc ConversationView: add current user to conversations, according to Mastodon behaviour
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 9f5f7dc9f9 Fixed User.is_discoverable attribute rendering in Admin API User view.
4 years ago
Ivan Tashkinov da4a1e57b1 @doc fix.
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
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
Maksim Pechnikov d28f72a55a FrontStatic plug: excluded invalid url
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 de6d49c8ce ActivityPub: Add back debug call + explanation.
4 years ago
lain 9542c5d0f4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
4 years ago
Haelwenn 073ad7e6d9 Merge branch 'docs/ap_c2s' into 'develop'
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
Ivan Tashkinov 8a68673eed [#3059] Formatting fix.
4 years ago
Ivan Tashkinov 8a55de1d78 [#3059] Fixed Phoenix 1.5 telemetry processing.
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 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
Haelwenn 2ca98f2d94 Apply 1 suggestion(s) to 1 file(s)
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
lain e97b254c6b Transmogrifier: Refactor and unify incoming tag handling
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 d54233760f [#3053] Post-merge fix.
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
Haelwenn 724e4b7f00 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim Pechnikov 2030ffd490 fix test
4 years ago
Maksim Pechnikov cf53e300f8 added generate the release env to `pleroma.instance gen`
4 years ago
Maksim e2333f757a Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim 499df7b73a Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim Pechnikov 14054cd004 update task messages
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
feld 77bca41595 Apply 3 suggestion(s) to 3 file(s)
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
Egor Kislitsyn 6734abcbd4
Add pagination for Mutes
4 years ago
Haelwenn (lanodan) Monnier f5d8af1db1
Move Consistency.FileLocation to ./test
4 years ago
Egor Kislitsyn 33f4f39b1c
Add pagination for Blocks
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 3cb9c88837
migration and warning for RemoteIp plug rename
4 years ago
Alexander Strizhakov 5f2071c458
changes 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 c4c5caedd8
changes after rebase
4 years ago
Alexander Strizhakov 1d0e130cb3
fixes after rebase
4 years ago
Alexander Strizhakov 0f8ab46a0e
fix after rebase
4 years ago
Alexander Strizhakov 207211a2b3
update files consistency after rebase
4 years ago
Alexander Strizhakov 3c8c540707
copyright
4 years ago
Alexander Strizhakov b6eb7997f5
special namespaces for phoenix and api_spec
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 970932689f
DigestPlug rename
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 abc3c7689b
HTTPSecurityPlug module name and filename
4 years ago
Alexander Strizhakov 5cd7030076
IdempotencyPlug module name
4 years ago
Alexander Strizhakov 8dfaa54ffc
InstanceStatic 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 d36c9e210a
StaticFEPlug module name
4 years ago
Alexander Strizhakov a07688deb1
TrailingFormatPlug module name
4 years ago
Alexander Strizhakov a5987155f7
UploadedMedia 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 2125286e90
fix for fallback controller
4 years ago
Alexander Strizhakov e267991a44
renaming LimiterSupervisor
4 years ago
Alexander Strizhakov 6a87f94ee2
renaming ratelimiter supervisor
4 years ago
Alexander Strizhakov 2501793f81
moving plugs into web dir
4 years ago
Alexander Strizhakov 0374df1d12
other files consistency
4 years ago
Alexander Strizhakov fc7151a9c4
more files renamings
4 years ago
Alexander Strizhakov e8e4034c48
metadata providers consistency
4 years ago
Alexander Strizhakov b5b4395e4a
oauth consistency
4 years ago
Alexander Strizhakov 103f3dcb9e
rich media parser ttl files consistency
4 years ago
Alexander Strizhakov 6bf85440b3
mix tasks consistency
4 years ago
Alexander Strizhakov b573711e9c
file locations consistency
4 years ago
Alex Gleason 83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932
4 years ago
Alex Gleason 66e00ace7c
Refactor User.post_register_action/1 emails
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
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 bb8c0614ef
Move admin approval email logic into User.post_register_action/1
4 years ago
Alex Gleason 521e965884
Registration tests
4 years ago
Alex Gleason 28005563f0
Send approval pending email during registration
4 years ago
Alex Gleason c69b205409
Registration: user state is separate from instance state
4 years ago
Alex Gleason b2fed59209
Handle User.post_register_action/1 in steps
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
Ivan Tashkinov e1eb54d389 [#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
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 5ec7d88b77
Aliases: fix URL regex
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 ed6511a086 Lint
4 years ago
Mark Felder 822e4472f3 Fix incorrect use of connect/1
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 70880d54f8 @env is not used
4 years ago
Mark Felder 42e78a08b2 Fix rendering of reports
4 years ago
Mark Felder 8caa6cf91d Transport.connect/7 is deprecated
4 years ago
feld 6d1666a080 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder 218a3e61e1 Fix incompatible types warning (Elixir 1.11)
4 years ago
Mark Felder d3106c69c8 Fix incompatible type (Elixir 1.11)
4 years ago
Mark Felder 636c00037d Fix duplicate @doc entries
4 years ago
Egor Kislitsyn bc3db72403
Use ModerationLog instead of Logger
4 years ago
Egor Kislitsyn 8545d533dd
Use to_string/1 instead of :binary.list_to_bin/1
4 years ago
Egor Kislitsyn 08972dd135
Use Path.join/2
4 years ago
Egor Kislitsyn 9af9f02f4b
Use Gettext for error messages
4 years ago
Egor Kislitsyn d7a5291b4f
Use `Jason.encode/1` for likes and bookmarks
4 years ago
Egor Kislitsyn 8baee855d9
Fix emails
4 years ago
Egor Kislitsyn e4792ce76a
Do not limit admins
4 years ago
Egor Kislitsyn 17562bf414
Move API endpoints to `/api/v1/pleroma/backups`
4 years ago
Egor Kislitsyn a9efd441e2
Use `Pleroma.Repo.chunk_stream/2` instead of `Pleroma.RepoStreamer.chunk_stream/2`
4 years ago
Egor Kislitsyn e50314d9d3
Fix export
4 years ago
Egor Kislitsyn 7c22c9afb4
Allow admins request user backups
4 years ago
Egor Kislitsyn 7fdd81d000
Add "Your backup is ready" email
4 years ago
Egor Kislitsyn e52dd62e14
Add configurable temporary directory
4 years ago
Egor Kislitsyn 27bc121ec0
Require email
4 years ago
Egor Kislitsyn cd13613db3
Fix query
4 years ago
Egor Kislitsyn 86ce4afd93
Improve backup urls
4 years ago
Egor Kislitsyn 2c73bfe122
Add API endpoints for Backups
4 years ago
Egor Kislitsyn 739cb1463b
Add backups deletion
4 years ago
Egor Kislitsyn 3ad7492f9d
Add config for Pleroma.Backup
4 years ago
Egor Kislitsyn a0ad9bd734
Add BackupWorker
4 years ago
Egor Kislitsyn 4f3a633745
Add `backups` table
4 years ago
Egor Kislitsyn 75e07ba206
Fix tests
4 years ago
Egor Kislitsyn be42ab70dc
Add backup upload
4 years ago
Egor Kislitsyn c01a818048
Add tests
4 years ago
Egor Kislitsyn 9d564ffc29
Zip exported files
4 years ago
Egor Kislitsyn 257e059e61
Add account export
4 years ago
Mark Felder 7a2ed2fc90 Credo
4 years ago
Mark Felder d43d05005a Move hardcoded default configuration into config.exs
4 years ago
Mark Felder cddca85c84 Merge branch 'develop' into revert/rich-media-censorship
4 years ago
rinpatch 2698bbc9f6 Merge branch 'filtering-following' into 'develop'
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
Haelwenn (lanodan) Monnier f497eb034d
activity_pub_controller.ex: Remove unused @doc block
4 years ago
Mark Felder 346cc3ac24 Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
4 years ago
Mark Felder 35ee759e74 Add helper function to convert single IPs into CIDR format if they were not provided that way
4 years ago
rinpatch 9e96c9ae48 Merge branch 'fix/empty-params-openapi' into 'develop'
4 years ago
Ivan Tashkinov f6024252ae [#3053] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
4 years ago
Ivan Tashkinov 0d575735bf No auth check in UserController.feed_redirect/2, even on non-federating instances.
4 years ago
Ivan Tashkinov 7efadc3cbd No auth check in OStatusController, even on non-federating instances.
4 years ago
Alexander Strizhakov cbdaabad34
web push http_client fix
4 years ago
rinpatch 2566467782 Merge branch '2201-i-hate-this' into 'develop'
4 years ago
lain 90fee49c52 User search: Once again, change uri handling.
4 years ago
rinpatch 006b62fd12 OpenAPI CastAndValidate: filter out empty params
4 years ago
Mark Felder b3a9ba09ec More robust expires_at timestamp processing
4 years ago
lain 2a11068a11 Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
4 years ago
Ivan Tashkinov 7d5c3883ac [#3031] Refactoring: moved system commands checks to ApplicationRequirements.
4 years ago
Mark Felder ba7f9459b4 Revert Rich Media censorship for sensitive statuses
4 years ago
Maksim Pechnikov de993b856b added `force` option to the unfollow operation
4 years ago
Ivan Tashkinov 4e4f771082 Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
4 years ago
Mark Felder dcdf75fbac Merge branch 'develop' into fix/deprecation-warning-welcome-message
4 years ago
feld 1672d8b37c Merge branch 'feature/bulk-confirmation' into 'develop'
4 years ago
Mark Felder 2bf2c68dee Merge branch 'develop' into fix/deprecation-warning-welcome-message
4 years ago
Mark Felder 8b84ca4901 Simplify the value comparison
4 years ago
rinpatch 5cd71208d9 Merge branch 'search-even-more' into 'develop'
4 years ago
rinpatch f67c967c4a Merge branch 'features/incoming-create-exists' into 'develop'
4 years ago
lain 05b5241314 Linter fixes
4 years ago
lain a8c17ea25a User Search: Also find user by uri
4 years ago
Mark Felder 81faf540b3 Add some user feedback
4 years ago
Mark Felder e33360fdb9 Cannot use batches with User.try_send_confirmation_email/1
4 years ago
Mark Felder 935ef21b02 Use the import
4 years ago
lain d0078bc404 User Search: Boost resolved results and exact ap_id matches.
4 years ago
Alexander Strizhakov 5d7ec00bed
fixes after rebase
4 years ago
Alexander Strizhakov 8c6ec4c111
pack routes change
4 years ago
Alexander Strizhakov dbbc801667
pagination for remote emoji packs
4 years ago
Alexander Strizhakov 9b6d89ff8c
support for special chars in pack name
4 years ago
Mark Felder 8af8eb5ce7 Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream
4 years ago
Mark Felder f3a1f9c3bb Merge branch 'develop' into feature/bulk-confirmation
4 years ago
lain e02101e15c Merge branch 'issue/2115' into 'develop'
4 years ago
lain 4dadb7c433 Merge branch 'user-query/filter-out-internal' into 'develop'
4 years ago
lain 436d1a3c41 Merge branch 'develop' into 'issue/2115'
4 years ago
Haelwenn (lanodan) Monnier 5e86a2809e
transmogrifier: Drop incoming create early if it already exists
4 years ago
Roman Chvanikov 8f5589cf66 Merge develop
4 years ago
lain a6c14041c4 Merge branch 'develop' into 'issue/1975'
4 years ago
Maksim Pechnikov 72d2b34d3b Merge branch 'develop' into issue/1975
4 years ago
Alex Gleason 3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
4 years ago
Mark Felder e2dcf039d2 Fix gun_pool_options deprecation warning message
4 years ago
Mark Felder 2fc3b46ee7 Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
4 years ago
lain c95859e45b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
4 years ago
Egor Kislitsyn 0e0ece251a
Filter out internal users by default
4 years ago
lain ee3052a2d8 ActivityPub: Return Announces when filtering by `following`.
4 years ago
Mark Felder e5927e92a6 Fix deprecation warning for welcome message
4 years ago
feld a5c34e3123 Merge branch 'fix/fedsocket-useragent' into 'develop'
4 years ago
Alex Gleason 23d5d7cf59
Fix #2172 HTTP error on password reset
4 years ago
Alex Gleason 8b6ac45f3c
Allow emails to be sent again, #2101 #2172
4 years ago
lain 59680f27ff Merge branch 'bugfix/federator-actor-error' into 'develop'
4 years ago
lain 9108e27c2f Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
4 years ago
lain b36b6259d8 Merge branch 'issue/2099' into 'develop'
4 years ago
Mark Felder 8afdbcdb1c Force HTTP for fedsockets
4 years ago
lain f2f0a0260f ActivityPub: Don't block-filter your own posts
4 years ago
Roman Chvanikov 28d0986f83 Refactor mutes removing in CommonAPI and User
4 years ago
Roman Chvanikov 4987ee6256 Merge branch 'develop' into feature/expire-mutes
4 years ago
Ivan Tashkinov 60b025b782 [#2074] OAuth scope checking in Streaming API.
4 years ago
rinpatch 4b12e071ac OpenAPI: make it possible to generate a spec without starting the app
4 years ago
rinpatch 51116b5392 OpenAPI: fix various errors pointed out by editor.swagger.io
4 years ago
Mark Felder 26859c549c Add user agent to fedsocket requests
4 years ago
Maksim Pechnikov ed3bc53fa1 Merge branch 'develop' into issue/2099
4 years ago
feld 6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop'
4 years ago
rinpatch 26c571df33 FedSockets: fix log spam on cached rejects
4 years ago
Steven Fuchs f2ef9735c5 Federate data through persistent websocket connections
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
4 years ago
Haelwenn (lanodan) Monnier 7bf269fe83 Fix MRF reject for ChatMessage
4 years ago
Haelwenn (lanodan) Monnier abf25e5d52 Create MRF.filter_pipeline to inject :object_data when present
4 years ago
Haelwenn (lanodan) Monnier 3a0f99ed35 KeywordPolicy: Still match when fields are absent
4 years ago
Haelwenn beefc022dd Merge branch 'omit-nondiscoverable-from-search' into 'develop'
4 years ago
feld 608824b97e Merge branch 'instance-docs' into 'develop'
4 years ago
rinpatch 6bbd65fb09 Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
4 years ago
rinpatch 608017b7df Merge branch 'fix/streaming-termination-errors' into 'develop'
4 years ago
Haelwenn 0465bdbd49 Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
4 years ago
lain bb70b231d0 Merge branch 'reply-visibility-user-guard' into 'develop'
4 years ago
rinpatch 22d49993d9 Merge branch 'bugfix/mrf-ingestion' into 'develop'
4 years ago
stwf 41939e3175 User search respect discoverable flag
4 years ago
rinpatch eff7f9892d Merge branch 'hotfix/rich-media-compile-error' into 'develop'
4 years ago
rinpatch dee4639dbb Merge branch 'feat/rich-media-head' into 'develop'
4 years ago
Mark Felder f7e40f7ef1 Deny ConfigDB migration when deprecated settings found
4 years ago
lain 2a7c9ac147 Merge branch 'nondiscoverable-user-metadata' into 'develop'
4 years ago
Ivan Tashkinov d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
Ivan Tashkinov 7cdbd91d83 [#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
4 years ago
lain 7c60789ba5 Merge branch 'develop' into 'nondiscoverable-user-metadata'
4 years ago
rinpatch db80b9d630 RichMedia: Fix log spam on failures and resetting TTL on cached errors
4 years ago
eugenijm c711a2b157 Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
4 years ago
eugenijm 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
Roman Chvanikov 44e8b6037a Merge branch 'develop' into feature/expire-mutes
4 years ago
lain 7a73850928 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
4 years ago
Maksim Pechnikov 5a8ea0a5b0 small refactoring
4 years ago
Maksim Pechnikov b867f9d7ae Merge branch 'develop' into issue/2099
4 years ago
Ivan Tashkinov a781f41f96 [#2497] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
4 years ago
rinpatch 3a9baa9d0d Merge branch '2144-empty-users' into 'develop'
4 years ago
lain 7a88b726bf User: Remote users don't need to be confirmed or approved
4 years ago
rinpatch a4f80e1e74 Merge branch 'feat/connection-worker-monitor-flush' into 'develop'
4 years ago
rinpatch adb1b0282d ConnectionPool Worker: use monitor flush instead of checking ref
4 years ago
rinpatch eca8d26784 Merge branch 'chores/mrf-loglevel' into 'develop'
4 years ago
rinpatch adbd0032fa Merge branch 'features/validators-video' into 'develop'
4 years ago
lain 6b088ed76a Merge branch 'issue/2089' into 'develop'
4 years ago
Maksim Pechnikov 599f8bb152 RepoStreamer.chunk_stream -> Repo.chunk_stream
4 years ago
Ivan Tashkinov 2f155fb89f Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
eugenijm 3ab59a6f3c Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
4 years ago
Haelwenn 5c4ff5c73c Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
4 years ago
Mark Felder 709723182d Ensure SimplePolicy's tags in string representation don't trip up the object validator
4 years ago
stwf 38b2db297b search indexing metadata respects discoverable flag
4 years ago
rinpatch bb407edce4 RichMedia: fix a compilation error due to nonexistent variable
4 years ago
rinpatch f70335002d RichMedia: Do a HEAD request to check content type/length
4 years ago
rinpatch f66a15c4a5 RichMedia parser: do not set a cache TTL for unchanging errors
4 years ago
Maksim Pechnikov 3e53ab4e98 added notification constraints
4 years ago
Maksim 489a107cf4 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Roman Chvanikov c5830ac037 Merge develop
4 years ago
Roman Chvanikov 527afb813a Remove unused require
4 years ago
Ivan Tashkinov cd234a5321 [#2497] Media preview proxy: preview bypass for small images
4 years ago
Ivan Tashkinov 32831f371f [#2497] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.
4 years ago
Mark Felder c0b36621f1 Ensure we only apply NSFW Simple policy on parsable objects
4 years ago
Alex Gleason 9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
4 years ago
Alex Gleason e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
4 years ago
Alex Gleason 02d70228b5
AdminAPI: fix delete chat message
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 c41430b23e
Refactor with Chat.for_user_query/1
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
Alex Gleason f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
4 years ago
Haelwenn (lanodan) Monnier f1f44069ae
Fetcher: Correctly return MRF reject reason
4 years ago
Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
4 years ago
rinpatch 89a7efab69 ConnectionPool: Log possible HTTP1 blocks
4 years ago
Haelwenn 36c9197ac3 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Haelwenn (lanodan) Monnier dbc013f24c
instance: Handle not getting a favicon
4 years ago
Haelwenn (lanodan) Monnier f18178cb09
AttachmentValidator: directly embed url schema and pass it fix_media_type
4 years ago
Haelwenn (lanodan) Monnier 1b3d5956b1
Pipeline Ingestion: Article
4 years ago
Haelwenn (lanodan) Monnier 2132b24a9d
object_validators: likes & announcements as [ObjectID]
4 years ago
Haelwenn (lanodan) Monnier 846b59ccb0
Pipeline Ingestion: Video
4 years ago
Haelwenn (lanodan) Monnier b73e9ef686
transmogrifier: Call strip_internal_fields on pipeline ingestion
4 years ago
Haelwenn (lanodan) Monnier da876d09e8
federator: normalize only actor, catch actor error
4 years ago
Mark Felder 55562ca936 Merge branch 'develop' into feature/gen-magic
4 years ago
Ivan Tashkinov 4d18a50f3c [#2497] Formatting fix.
4 years ago
Alexander Strizhakov 15aece7238 remove validate_expires_at from enqueue method
4 years ago
Alexander Strizhakov 2c2094d4b2 configurable lifetime for ephemeral activities
4 years ago
Alexander Strizhakov f24828a3e8 oban warning
4 years ago
Alexander Strizhakov eb5ff715f7 pin/unpin for activities with expires_at option
4 years ago