Commit Graph

6214 Commits (a19f8778afddb7f504b08cedde752e37da52dc96)

Author SHA1 Message Date
Egor Kislitsyn 0a1394cc1a
Add OpenAPI spec for PollController
4 years ago
lain 92caae5923 Undoing: Move undoing blocks to the pipeline everywhere.
4 years ago
lain a3bb2e5474 Undoing: Move undoing announcements to the pipeline everywhere.
4 years ago
lain b34debe615 Undoing: Move undoing reactions to the pipeline everywhere.
4 years ago
Egor Kislitsyn 3a45952a3a
Add OpenAPI spec for ConversationController
4 years ago
Egor Kislitsyn 32ca9f2c59
Render mastodon-like errors in FilterController
4 years ago
Egor Kislitsyn 46aae346f8
Move single used schemas to Filter operation schema
4 years ago
Egor Kislitsyn 7e7a3e1544
Add OpenAPI spec for FilterController
4 years ago
lain 42a2acac46 Merge branch 'feature/1720-status-view' into 'develop'
4 years ago
Egor Kislitsyn ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
4 years ago
minibikini 42a4a863f1
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
4 years ago
minibikini 3817f179d7
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
4 years ago
minibikini b5189d2c50
Apply suggestion to lib/pleroma/web/api_spec/operations/instance_operation.ex
4 years ago
Egor Kislitsyn 88a14da817
Add OpenAPI spec for InstanceController
4 years ago
Alexander Strizhakov e7d8ab8303
admin_api fetch status by id
4 years ago
lain a3071f0231 Undoing: Move undoing likes to the pipeline everywhere.
4 years ago
Egor Kislitsyn f2bf4390f4
Fix descriptions for List API spec
4 years ago
Egor Kislitsyn 5ec6aad567
Add OpenAPI spec for ListController
4 years ago
Egor Kislitsyn babcae7130
Move single used schemas to Marker operation schema
4 years ago
Egor Kislitsyn 8096565653
Add OpenAPI spec for MarkerController
4 years ago
Egor Kislitsyn d861b0790a
Add OpenAPI spec for SubscriptionController
4 years ago
lain f1da8882f9 UndoValidator: Add UndoValidator.
4 years ago
rinpatch 33f2976020 Merge branch 'feature/1737-magic-key-field' into 'develop'
4 years ago
rinpatch 5482a1f6ef Merge branch 'openapi/validation-plug' into 'develop'
4 years ago
lain d201527004 Apply suggestion to lib/pleroma/web/web_finger/web_finger.ex
4 years ago
Egor Kislitsyn decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
lain db55dc9445 ActivityPub: Remove `react_with_emoji`.
4 years ago
lain ad771546d8 Transmogrifier: Move emoji reactions to common pipeline.
4 years ago
lain f21f538293 LikeValidator: Add defaults for recipients back in.
4 years ago
lain c297667f16 Merge branch 'fix/issue-1729' into 'develop'
4 years ago
lain 2cb3f8a8cf Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain 6400998820 AP C2S: Restrict creation to `Note`s for now.
4 years ago
lain f897da2115 WebFinger: Add back in subscribe_address.
4 years ago
lain 8bed6ea922 User, Webfinger: Remove OStatus vestiges
4 years ago
Haelwenn (lanodan) Monnier bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
4 years ago
Egor Kislitsyn e55fd530bc
Render better errors for ENUM validation
4 years ago
Egor Kislitsyn f070b5569c
Add a config option to enable strict validation
4 years ago
Egor Kislitsyn 4b9ab67aa8
Ignore unexpected ENUM values in query string
4 years ago
lain c23cb8d37a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
minibikini bfbff7d826 Apply suggestion to lib/pleroma/web/api_spec/cast_and_validate.ex
4 years ago
Egor Kislitsyn d08c63500b
Ignore unexpected query params
4 years ago
lain 3559dd1085 Transmogrifier: Rely on LikeValidator.
4 years ago
lain 0f9bed022f LikeValidator: Fix up context.
4 years ago
lain e03c301ebe LikeValidator: Fix up missing recipients.
4 years ago
lain 13ab8defc0 Pipeline: Move transctioning to common pipeline.
4 years ago
lain ec24c70db8 ActivityPub: Don't fetch `Application` follower counts.
4 years ago
lain b04328c3de ChatController: Add mark_as_read
4 years ago
lain 30590cf46b CommonAPI: Refactor for readability
4 years ago
lain 57e6f2757a ChatOperation: Make simple schema into inline schema
4 years ago
lain dcf535fe77 Credo fixes.
4 years ago
lain 651935f137 Schemas: Refactor to our naming scheme.
4 years ago
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2
4 years ago
lain 9249742f13 Types.Recipients: Simplify reducer.
4 years ago
lain a35b76431c Credo fixes.
4 years ago
lain a7966f2080 Webfinger: Request account info with the acct scheme
4 years ago
lain 1974d0cc42 DeleteValidator: The deleted activity id is an object id
4 years ago
lain 6fb96f64c1 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain 4dfc617cdf Transmogrifier: Don't fetch actor that's guaranteed to be there.
4 years ago
Lain Soykaf f20a1a27ef DeleteValidator: Improve code readability
4 years ago
Mark Felder 370e313e2d Only update follower/following stats for actor types of users and bots.
4 years ago
rinpatch 3126f8a334 Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
4 years ago
eugenijm 66a8e1312d Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
4 years ago
rinpatch e55876409b Deactivate local users on deletion instead of deleting the record
4 years ago
Ivan Tashkinov 2d07ed7747 [#1732] Made AP C2S :followers and :following endpoints serve on no auth
4 years ago
rinpatch 9e3ec58280 Merge branch 'follow-request-notifications' into 'develop'
4 years ago
Haelwenn 0dfb5ad0ad Merge branch 'bugfix/static-fe.css' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
4 years ago
Ivan Tashkinov cf5ca7e45b Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications
4 years ago
rinpatch c18ef452b0 OpenAPI: Add `follow_request` to notification types
4 years ago
rinpatch 85105f7aae OpenAPI: Remove max pagination limit from the spec
4 years ago
Ivan Tashkinov d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
4 years ago
lain 3453e54e6b MappedSignatureToIdentityPlug: Fix.
4 years ago
lain a912f72a36 Signature: Handle non-ap ids in key ids.
4 years ago
lain 3370bb0e46 Merge branch 'openapi/notifications' into 'develop'
4 years ago
lain 607e06c245 Merge branch 'openapi/reports' into 'develop'
4 years ago
lain 44fbd09709 Merge branch 'issue/1577' into 'develop'
4 years ago
lain 1ead5f49b8 AdminApiController: Use common pipeline for user deletion.
4 years ago
lain ebbd9c7f36 AdminAPIController: Refactor.
4 years ago
lain 2008fa9c7f Merge branch 'fix/captcha' into 'develop'
4 years ago
lain ab01863abf Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain 5f42e6629d DeleteValidator: Only allow deletion of certain types.
4 years ago
Alexander Strizhakov ecf37b46d2
pagination fix for service users filters
4 years ago
Ivan Tashkinov 92efb888c7 Made follow request notifications non-optional (removed config switch).
4 years ago
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2
4 years ago
Lain Soykaf 93f64aba78 Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
4 years ago
lain 32b8386ede DeleteValidator: Don't federate local deletions of remote objects.
4 years ago
lain a81342a234 Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
4 years ago
lain 999d639873 ActivityPub: Remove `delete` function.
4 years ago
lain 3b443cbc1d User: Use common pipeline to delete user activities
4 years ago
lain 5da08c2b73 SideEffects: Fix comment
4 years ago
lain 500f5ec14e SideEffects: On deletion, reduce the reply count cache
4 years ago
lain 60db58a1c6 Credo fixes.
4 years ago
lain ab60ee1776 SideEffects: On deletion, reduce the User note count.
4 years ago
lain c832d96fc9 SideEffects: Stream out deletes.
4 years ago
lain 4500fdc04c DeleteValidator: Add internal helper field after validation.
4 years ago
eugenijm bef34568f0 Dismiss the follow request notification on rejection
4 years ago
Ivan Tashkinov 2c4844237f Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
4 years ago
Alexander Strizhakov 4a487e4d0b
fix for auth check
4 years ago
lain 14c6672193 AP C2S: Use common pipelin for deletes.
4 years ago
lain fdd8e7f276 CommonAPI: Use common pipeline for deletions.
4 years ago
lain 417eed4a2b SideEffects: Handle deletions.
4 years ago
lain 1fb383f368 DeleteValidator: Deleting a user is valid.
4 years ago
lain 4dc5302f45 Transmogrifier: Handle incoming deletes for non-user objects.
4 years ago
Alexander Strizhakov 36abeedf9f
error rename
4 years ago
Alexander Strizhakov ddb757f743
emoji api packs changes in routes with docs update
4 years ago
Alexander Strizhakov 342f55fb92
refactor emoji api with fixes
4 years ago
lain db184a8eb4 DeleteValidator: Mastodon sends unaddressed deletes.
4 years ago
Alexander Strizhakov 5839e67eb8
return data only for updated emoji
4 years ago
lain 42ce7c5164 ObjectValidator: Add actor fetcher.
4 years ago
lain 64bb72f98a Typo fix.
4 years ago
lain ad2182bbd2 Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_create_request.ex
4 years ago
lain 4c4344b7b1 Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
4 years ago
Egor Kislitsyn 9c1adb35de
Merge branch 'develop' into openapi/notifications
4 years ago
Egor Kislitsyn 1898054da4
Merge branch 'develop' into openapi/reports
4 years ago
rinpatch 8cf3a32463 Add exlude_replies to OpenAPI spec for account timelines
4 years ago
lain b68d56c816 Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_response.ex
4 years ago
lain 145d35ff70 Apply suggestion to lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
4 years ago
lain 589ce1e96b Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
4 years ago
lain 89a6c34081 Apply suggestion to lib/pleroma/chat.ex
4 years ago
Egor Kislitsyn 39a78998d0
Change Pleroma.CaptchaTest to be a regular module instead of GenServer
4 years ago
Egor Kislitsyn 7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
4 years ago
Egor Kislitsyn 2f77842bd3
Fix account registration when captcha is enabled but not provided
4 years ago
lain 503de4b8df ObjectValidator: Add validation for `Delete`s.
4 years ago
lain 78c864cbee LikeValidator: Use Recipients Type.
4 years ago
lain b8056e69e0 Object Validator Types: Add Recipients.
4 years ago
lain 20587aa931 Chat message creation: Check actor.
4 years ago
lain a88734a0a2 Transmogrifier: Fetch missing actors for chatmessages.
4 years ago
lain 53e3063bd0 Transmogrifier: Remove ChatMessageHandling module.
4 years ago
lain e055b8d203 Pipeline: Always run common_pipeline in a transaction for now.
4 years ago
lain 67659afe48 ChatOperation: Refactor.
4 years ago
lain 0c491b904d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn 5238ae3dd3
Add OpenAPI spec for NotificationController
4 years ago
Ivan Tashkinov 4c0e53367a [#2349] Post-merge fix.
4 years ago
Ivan Tashkinov 908cf22a6c Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
4 years ago
lain dedffd100c Pipeline: Unify, refactor, DRY.
4 years ago
lain abd0928229 CreateChatMessageValidator: Validate object existence
4 years ago
lain 6aa116eca7 Create activity handling: Flip it and reverse it
4 years ago
Egor Kislitsyn 560f2c1979
Add OpenAPI spec for ReportController
4 years ago
lain b5dc59c8fa Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 12bb7fc0dc Merge branch 'openapi/account' into 'develop'
4 years ago
lain f8e56d4271 SideEffects: Use Object.normalize to get the object.
4 years ago
lain 906cf53ab9 Recipient Type: Cast all elements as ObjectIDs.
4 years ago
Egor Kislitsyn 764b4f95a8
Merge branch 'develop' into global-status-expiration
4 years ago
lain 9994768312 Merge branch 'mongoose-secure' into 'develop'
4 years ago
Maksim Pechnikov ea5142b94b convert markdown content to html
4 years ago
fence 5ff20793e7 formating
4 years ago
Egor Kislitsyn dda65f7799
Move single used schemas to operation schema
4 years ago
fence cc1e2e8d0f requested changes to mongoose_im_controller.ex
4 years ago
Egor Kislitsyn 2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
4 years ago
fence 5c7cc10917 add tests for deactivated users for mongoose auth
4 years ago
fence a626cb682c secure mongoose auth endpoint
4 years ago
lain 3d040b1a87 Credo fixes.
4 years ago
lain ad82a216ff Chat API: Align more to Pleroma/Mastodon API.
4 years ago
lain 49e673dfea ChatView: Add actor_account_id
4 years ago
lain 3635a9c9c2 InstanceController: Add extensions to `/api/v1/instance`
4 years ago
lain 00e956528b Credo fixes.
4 years ago
lain 15ba3700af Chat Schemas: Inline unimportant Schemas.
4 years ago
Egor Kislitsyn f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
lain c86143ed73 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alex Gleason 1bd9749a8f
Let blob: pass CSP
4 years ago
Ivan Tashkinov e16437ff19 [#1706] Formatting fix.
4 years ago
Ivan Tashkinov 0d05e1fe39 [#1706] Prevented error on unresolved activity actors for timeline actions.
4 years ago
Ivan Tashkinov b4139cc547 [#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
4 years ago
rinpatch 8addbd948c Merge branch 'bugfix/announce-race-condition' into 'develop'
4 years ago
lain c30b3b2dc5 Merge branch 'reply-filtering-refactor' into 'develop'
4 years ago
lain d89cd0a197 Reply Filtering: Refactor.
4 years ago
lain d862c7156a Merge branch 'openapi-improvements' into 'develop'
4 years ago
Egor Kislitsyn c56c0a3d23
Merge branch 'develop' into global-status-expiration
4 years ago
Ivan Tashkinov 00e62161f6 [#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
4 years ago
Alexander 6e625a427c
reply filtering
4 years ago
lain cb12585098 Announcements: Prevent race condition.
4 years ago
lain 1df6af2a4c Credo fixes.
4 years ago
lain bbf8554c97 ActivitPub: Remove `like` function.
4 years ago
Egor Kislitsyn f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
4 years ago
Ivan Tashkinov 89f38d94c7 [#2409] Fixed before-action callback results persistence.
4 years ago
lain 1e28d34592 ChatMessage: Correctly ingest emoji tags.
4 years ago
lain ec7335535d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch 1b5f8d19ee Merge branch 'bugfix/repeating-announce' into 'develop'
4 years ago
lain 7d38197894 CommonAPI: Don't make repeating announces possible
4 years ago
rinpatch 25eec6d72d Merge branch 'bugfix/null-scheduled-at' into 'develop'
4 years ago
lain 850377a7b8 Merge branch 'bugfix/1629-fav-race-condition' into 'develop'
4 years ago
lain 1bcbdc7a9f SideEffects: Use less cryptic syntax.
4 years ago
Haelwenn af27e4dffd Merge branch 'bugfix/1670-user-count' into 'develop'
4 years ago
lain f5bda09de6 Stats: Use `invisible` property for filtering.
4 years ago
Ivan Tashkinov e7fb593d13 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
4 years ago
lain e62173dfc8 SideEffects: Run in transaction.
4 years ago
Egor Kislitsyn 1b06a27746
Update Flake ID description
4 years ago
Egor Kislitsyn 6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
Ivan Tashkinov 0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
4 years ago
Ivan Tashkinov 2958a7d246 Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
4 years ago
Haelwenn 28f8fcf8b0 Merge branch 'fix/follow-and-blocks-import' into 'develop'
4 years ago
Haelwenn 468cc977be Merge branch 'bugfix/following-fix-status-code' into 'develop'
4 years ago
Haelwenn 238058ecae Merge branch 'bugfix/1543-streaming-boosts' into 'develop'
4 years ago
Ivan Tashkinov b03aeae8b9 Apply suggestion to lib/pleroma/notification.ex
4 years ago
Egor Kislitsyn 6db52c3b36 Fix Oban warning
4 years ago
Egor Kislitsyn e7771424a8 Fix blocks import
4 years ago
Egor Kislitsyn 88b82e5c3e Fix follow import
4 years ago
lain 7a3a88a13e Streamer: Stream boosts to the boosting user.
4 years ago
Haelwenn 1855c597c2 Merge branch 'feature/voters-count' into 'develop'
4 years ago
Haelwenn 2e73c19edc Merge branch 'worker-messages' into 'develop'
4 years ago
Karol Kosek 452072ec95
static_fe: Add microformats2 classes
4 years ago
lain 8b88e2a6e2 Stats: Ignore internal users for user count.
4 years ago
lain 5b39526198 AccountController: Use code 400 for self-follow.
4 years ago
lain 69ecc39038 Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'
4 years ago
lain c10485db16 StatusController: Ignore nil scheduled_at parameters.
4 years ago
lain 5102468d0f Polls: Persist and show voters' count
4 years ago
lain 923513b641 Federator: Return proper values for jobs
4 years ago
lain f719a5b23a WebPush: Return proper values for jobs.
4 years ago
lain 2e62a63749 ChatMessageValidator: Validation changes
4 years ago
Egor Kislitsyn 11433cd38d
Add OpenAPI schema for FlakeID
4 years ago
Egor Kislitsyn f0238d010a
Improve OpenAPI schema
4 years ago
lain 66c2eb670b ChatController: Validate parameters.
4 years ago
lain 97ad0c4597 Chats: Add API specs.
4 years ago
Ivan Tashkinov f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain a185b5455f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 3c828016d9 Merge branch 'openapi/custom-emojis' into 'develop'
4 years ago
lain 5165287ff4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov bb5d0eafa4 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
4 years ago
rinpatch e57c1b60e4 Merge branch 'accept-deletes' into 'develop'
4 years ago
rinpatch 7e456ac7f6 Merge branch 'router-cleanup' into 'develop'
4 years ago
Egor Kislitsyn 364eecc49f
Merge branch 'develop' into global-status-expiration
4 years ago
Alex Gleason bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
Egor Kislitsyn ed3974af24 Add OpenAPI spec for `AccountController.identity_proofs` operation
4 years ago
Egor Kislitsyn 736fead494 Merge branch 'develop' into openapi/account
4 years ago
lain 28165dad3a Merge branch 'cleanup-subscription-controller' into 'develop'
4 years ago
Ilja 8b4de61d64 Fix ObjectAgePolicyTest
4 years ago
Egor Kislitsyn 258d897579 Cleanup and DRY the Router
4 years ago
lain b5df4a98e4 ChatMessageView: Support emoji.
4 years ago
lain 7e53da250e ChatMessage: Support emoji.
4 years ago
lain b836d3d104 ChatMessageValidator: Require `published` field
4 years ago
lain 139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 970b74383b Credo fixes.
4 years ago
lain 5b6818b3e5 CommonAPI: Obey local limit for chat messages.
4 years ago
lain ce23673ca1 ChatMessageValidator: Don't validate messages that are too long.
4 years ago
rinpatch 918a8094fc Merge branch '1559-follow-request-notifications' into 'develop'
4 years ago
Haelwenn 79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
4 years ago
Haelwenn 24f760c2f7 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
Haelwenn (lanodan) Monnier eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
4 years ago
Ivan Tashkinov 66f55106bd [#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
4 years ago
Egor Kislitsyn 163341857a
Improve OpenAPI errors
4 years ago
lain c845820911 Notifications: Create a chat notification.
4 years ago
rinpatch e0d7847bc5 Merge branch 'sideeffects-test' into 'develop'
4 years ago
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 26d9c83316 SideEffects: Test for notification creation.
4 years ago
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
4 years ago
lain 372614cfd3 ChatView: Add a mastodon api representation of the recipient.
4 years ago
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
4 years ago
Haelwenn (lanodan) Monnier 46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
4 years ago
lain d45ae64858 ChatController: Use OAuth scopes.
4 years ago
Alexander Strizhakov 6cda360fea
don't restart postgrex
4 years ago
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
4 years ago
Haelwenn d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop'
4 years ago
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
4 years ago
Alexander Strizhakov 304ea09f4c
fix for logger configuration
4 years ago
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
4 years ago
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
4 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
4 years ago
lain f8c3ae7a62 ChatController: Handle pagination.
4 years ago
lain e983f70884 ChatMessagesHandling: Strip HTML of incoming messages.
4 years ago
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities
4 years ago
rinpatch 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
4 years ago
rinpatch 77ee64b993 user: remove blank?
4 years ago
lain 41fdcb7282 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain ca598e9c27 AccountView: Return user ap_id.
4 years ago
lain e2ced04917 ChatMessages: Better validation.
4 years ago
Alexander Strizhakov 72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
lain 3d4eca5dd4 CommonAPI: Escape HTML for chat messages.
4 years ago
Egor Kislitsyn cf4ebba774
Cleanup SubscriptionController
4 years ago
Maksim Pechnikov 4b3b1fec4e added an endpoint for getting unread notification count
4 years ago
Ivan Tashkinov bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
4 years ago
lain 6ace22b56a Chat: Add views, don't return them in timeline queries.
5 years ago
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
5 years ago
Haelwenn b1c1d2e5e1 Merge branch 'fix/1659-rate-limiter' into 'develop'
5 years ago
Egor Kislitsyn 65f04b7806
Fix credo warning
5 years ago
Egor Kislitsyn 16f4787bf7
Add a TODO note
5 years ago
Egor Kislitsyn 0e647ff55a
Abstract pagination params in OpenAPI spec
5 years ago
lain 44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
Alexander Strizhakov 22bde21c4f
remote_ip plug adds remote_ip_found flag
5 years ago
Egor Kislitsyn 8ed162b655 Fix formatting
5 years ago
minibikini 5a2e45a218 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
5 years ago
minibikini 81a4c15816 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
5 years ago
minibikini a45bd91d4e Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
5 years ago
minibikini bfa26b0937 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
5 years ago
minibikini a794ba655f Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
5 years ago
minibikini a7feca1604 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
5 years ago
minibikini d3e876aeee Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
5 years ago
lain 6bc76df287 Uploads: Sandbox them in the CSP.
5 years ago
rinpatch 96eae62995 Merge branch 'fix/openapi-form-mimetype' into 'develop'
5 years ago
rinpatch cc4ff19e34 openapi: add application/x-www-form-urlencoded to body types
5 years ago
Ivan Tashkinov f7e623c11c [#1364] Resolved merge conflicts with `develop`.
5 years ago
Ivan Tashkinov 0cda80f266 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
5 years ago
Mark Felder 3bf78f2be7 Fix Oban not receiving :ok from RichMediaHelper job
5 years ago
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
5 years ago
Egor Kislitsyn 247e6fcb90
Merge branch 'develop' into openapi/account
5 years ago
feld bf3afbc1a1 Merge branch 'logger-configuration' into 'develop'
5 years ago
lain 5fc6ce30ac Merge branch 'chore/spelling' into 'develop'
5 years ago
lain 2eae5793cd Merge branch 'fix/issue_1679' into 'develop'
5 years ago
Ivan Tashkinov 650853fc89 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
5 years ago
Haelwenn 60cc7d6c9a Merge branch 'issue/1276' into 'develop'
5 years ago
Maksim Pechnikov c4e7ed660c fix logger message
5 years ago
Mark Felder f3725b8fc4 Fix spelling
5 years ago
Egor Kislitsyn 4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Maksim Pechnikov a16b3dbcbf Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn c28aaf9d82
Add OpenAPI spec for CustomEmojiController
5 years ago
Egor Kislitsyn 7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
5 years ago
Egor Kislitsyn ab185d3ea4
Add spec for AccountController.follows
5 years ago
Egor Kislitsyn 68a979b824
Add specs for AccountController.block and AccountController.unblock
5 years ago
Egor Kislitsyn e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
5 years ago
Egor Kislitsyn aa958a6dda
Add spec for AccountController.unfollow
5 years ago
Egor Kislitsyn 854780c72b
Add spec for AccountController.follow
5 years ago
Egor Kislitsyn 1b680a98ae
Add spec for AccountController.lists
5 years ago
Egor Kislitsyn e105cc12b6
Add spec for AccountController.following
5 years ago
Egor Kislitsyn bd6e2b300f
Add spec for AccountController.followers
5 years ago
Egor Kislitsyn 03124c96cc
Add spec for AccountController.statuses
5 years ago
Egor Kislitsyn 278b3fa0ad
Add spec for AccountController.show
5 years ago
Egor Kislitsyn d7d6a83233
Add spec for AccountController.relationships
5 years ago
Egor Kislitsyn ab400b2ddb
Add specs for ActorType and VisibilityScope
5 years ago
Egor Kislitsyn 260cbddc94
Add spec for AccountController.update_credentials
5 years ago
Egor Kislitsyn f80116125f
Add spec for AccountController.verify_credentials
5 years ago
Egor Kislitsyn b08ded6c2f
Add spec for AccountController.create
5 years ago
Ivan Tashkinov 99b0bc1989 [#1364] Resolved merge conflicts with `develop`. Refactoring.
5 years ago
Egor Kislitsyn dc8fa04192
Merge branch 'develop' into global-status-expiration
5 years ago
Ivan Tashkinov f00ff20768 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
5 years ago
Ivan Tashkinov a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
Alexander Strizhakov a050f3e015
fix for logger configuration through admin-fe
5 years ago
Maksim Pechnikov c5c09fc61b fix mediaType of object
5 years ago
Alex Gleason 9a3c74b244
Always accept deletions through SimplePolicy
5 years ago
Ivan Tashkinov c556efb761 [#1364] Enabled notifications on followed domain-blocked users' activities.
5 years ago
rinpatch 5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop'
5 years ago
rinpatch c077ad0b33 Remove User.upgrade_changeset in favor of remote_user_creation
5 years ago
Ivan Tashkinov 88b16fdfb7 [#1364] Disabled notifications on activities from blocked domains.
5 years ago
Egor Kislitsyn dd612f86ae
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
lain 64c78581fe Chat: Only create them for valid users for now.
5 years ago
Egor Kislitsyn 7f692343c8
Merge branch 'develop' into global-status-expiration
5 years ago
Egor Kislitsyn cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
Haelwenn 4d33e0bd50 Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier e89078ac2a
User: remove source_data
5 years ago
Haelwenn (lanodan) Monnier 3420dec494
Remove User.fields/1
5 years ago
Haelwenn (lanodan) Monnier 9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Haelwenn (lanodan) Monnier 62656ab259
User: Move inbox & shared_inbox to own fields
5 years ago
Haelwenn (lanodan) Monnier 369c03834c
formatter: Use user.uri instead of user.source_data.uri
5 years ago
Haelwenn (lanodan) Monnier b6bed1a284
Types.URI: New
5 years ago
Haelwenn (lanodan) Monnier 19eedb3d04
User: Move public_key from source_data to own field
5 years ago
Haelwenn (lanodan) Monnier 5628984df4
User: remove source_data use for follower_address and following_address
5 years ago
lain 2cc6841424 ChatController: Basic message posting.
5 years ago
lain e8fd0dd689 ChatController: Basic support for returning messages.
5 years ago
lain 68abea313d ChatController: Add creation and return of chats.
5 years ago
Egor Kislitsyn d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
Ivan Tashkinov ac672a9d6b [#1559] Addressed code review requests.
5 years ago
lain d35e114acd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain 8e637ae1a7 CommonAPI: Basic ChatMessage support.
5 years ago
lain 2e78686686 SideEffects: Handle ChatMessage creation.
5 years ago
lain b87b798ca1 Merge branch 'fix/1658-invite-send' into 'develop'
5 years ago
Alexander Strizhakov f20a19de85
typo fix
5 years ago
Alexander Strizhakov 1cf0d5ab0d Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
Alexander Strizhakov 4c60fdcbb1 Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
lain d2e21fbc96 Merge branch 'open-api' into 'develop'
5 years ago
lain 564f3f01ca Merge branch 'formatter-html-safe' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
5 years ago
rinpatch d067eaa7b3 formatter.ex: Use Phoenix.HTML for mention/hashtag generation
5 years ago
Alexander Strizhakov 5739c498c0
fix for gun connections pool
5 years ago
lain 3775683a04 ChatMessage: Basic incoming handling.
5 years ago
Ivan Tashkinov 1a4875adfa [#1559] Support for "follow_request" notifications (configurable).
5 years ago
rinpatch dd4d10b275 Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
5 years ago
Maksim Pechnikov 2b7d7bbd2d Merge branch 'develop' into issue/1276
5 years ago
lain 19335be24c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
Egor Kislitsyn 03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
5 years ago
lain 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop'
5 years ago
lain 349b9d86dc Merge branch 'remake-remodel-2' into 'develop'
5 years ago
lain 772bc258cd ObjectID Validator: Refactor.
5 years ago
lain e67cde0ed6 Transmogrifier: Refactoring / Renaming.
5 years ago
Ivan Tashkinov fc81e5a49c Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
5 years ago
Ivan Tashkinov aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Egor Kislitsyn 0aa24a150b
Add oAuth
5 years ago
lain fd97b0e634 Chats: Basic implementation.
5 years ago
Maksim Pechnikov dbcfac11b4 Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn 23219e6fb3
Add OpenAPI
5 years ago
Alexander Strizhakov 2d64500a9d
error improvement for email_invite endpoint
5 years ago
Ivan Tashkinov 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
feld ef7d2b0f11 Merge branch 'gun' into 'develop'
5 years ago
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
5 years ago
lain 037b49c415 Validators: Correct ObjectID filename
5 years ago
rinpatch bfec45bf74 Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
5 years ago
Alexander Strizhakov 94ddbe4098
restrict remote users from indexing
5 years ago
Haelwenn (lanodan) Monnier 185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn (lanodan) Monnier b30fb1f3bb
User: Fix use of source_data in profile_url/1
5 years ago
kPherox 7408f003a6
Use `Pleroma.Formatter.linkify` instead of `AutoLinker.link`
5 years ago
lain c982093cc2 Transmogrifier: Fix BAD code by RINPATCH
5 years ago
lain 1b323ce1c6 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain ecac57732a Transmogrifier: Only add context if it really is onne.
5 years ago
lain 51fc504705 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain 288f2b5a7c Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain 0be1fa0a86 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain 057438a657 CommonAPI: DRY up a bit.
5 years ago
lain 643f15e77b Validators: ObjectID is an http uri.
5 years ago
kPherox d191b0942f
Remove no longer used function
5 years ago
lain f6835333be Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
Ivan Tashkinov ea9c57b26e [#2332] Misc. improvements per code change requests.
5 years ago
Ivan Tashkinov 9c94b6a327 [#2332] Misc. fixes per code change requests.
5 years ago
lain 8bd5ad8664 Merge branch 'benchmark-improvements' into 'develop'
5 years ago
Alexander Strizhakov b607ae1a1c
removing grouped reports admin api endpoint
5 years ago
Alexander Strizhakov 1fcdcb12a7
updating gun with bug fix
5 years ago
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov eb9744cade
activities generation tasks
5 years ago
Haelwenn e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop'
5 years ago
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov be9d18461a FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov dfbc05d496 Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
Ivan Tashkinov 6b793d3f83 Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
5 years ago
lain 29ab1d9f8d Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain 69fc1dd69f Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain 0c60c0a76a Validators: Use correct type for IDs.
5 years ago
lain 0adaab8e75 Bump copyright dates.
5 years ago
lain eaacc64839 Refactors.
5 years ago
lain ee979dd6d7 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain d7aa0b645b Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
5 years ago
lain 4cf1007a7d ActivityPub: Small refactor.
5 years ago
Ivan Tashkinov 112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
rinpatch af820f8cf1 Merge branch 'benchmark_timeline' into 'develop'
5 years ago
Ivan Tashkinov 460e41585c Further preloading (more endpoints), refactoring, tests.
5 years ago
Ivan Tashkinov be5e2c4dbb Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
5 years ago
Ivan Tashkinov 3fa3d45dbe [#1364] Minor improvements / comments.
5 years ago
Ivan Tashkinov 012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Ivan Tashkinov e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships".
5 years ago
Haelwenn (lanodan) Monnier 212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
5 years ago
Ivan Tashkinov 8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov 13cbb9f6ad Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
feld 8eebc75c15 Merge branch 'fix/activity-deletion' into 'develop'
5 years ago
rinpatch f316882464 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
lain aaf00f1ff5 Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain 74560e888e Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
5 years ago
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop'
5 years ago
Egor Kislitsyn 4a2538967c
Support pagination in conversations
5 years ago
Egor Kislitsyn d1a9716a98
Fix activity deletion
5 years ago
rinpatch fbf02a3722 Merge branch 'bugfix/profile-bio-newline' into 'develop'
5 years ago
lain 3bd2829e5c Benchmarks: Add timeline benchmark
5 years ago
Ivan Tashkinov 86f2fbc81e Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Egor Kislitsyn 5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
Ivan Tashkinov 3c78e5f327 Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
5 years ago
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Ivan Tashkinov c2e415143b WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
5 years ago
Haelwenn (lanodan) Monnier 15be6ba9c2
AccountView: fix for other forms of <br> in bio
5 years ago
rinpatch 981e015f1b Mastodon API Account view: Remove an outdated hack
5 years ago
Egor Kislitsyn 80e1571610
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov 9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
Egor Kislitsyn cb8236cda6
Add embeddable posts
5 years ago
lain d74405fc1a Merge branch 'fix-feed-pagination' into 'develop'
5 years ago
lain 1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
Alexander Strizhakov fe15f0ba15
restrict_unauthenticated setting
5 years ago
Alexander Strizhakov 98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
Haelwenn (lanodan) Monnier a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
5 years ago
Haelwenn (lanodan) Monnier c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
5 years ago
lain 9b9d67bbec Fix linting.
5 years ago
lain 3c2c32b460 Merge branch 'remake-remodel' into develop
5 years ago
Mark Felder 7d275970ab Add emoji reactions to features in nodeinfo
5 years ago
Haelwenn (lanodan) Monnier f9d622d25a
WIP
5 years ago
Alexander Strizhakov f9ecb513fa
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov 7438833685 [#1364] Improved notification-related tests.
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 f3791add99
removing with_move parameter
5 years ago
Ivan Tashkinov 0e07c5ef57 Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Alexander Strizhakov bf474ca3c1
fix
5 years ago
Alexander Strizhakov 35471205f8
temp fix for `:gun.info` MatchError
5 years ago
Egor Kislitsyn 421e35b578
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 89e4b3ebbd
fix for content-type header for tag feed
5 years ago
Alexander Strizhakov 91870c8995
adding rss for user feed
5 years ago
Alexander Strizhakov 26e2076659
fix for feed page pagination
5 years ago
Haelwenn (lanodan) Monnier 8176ca9e40 static_fe: Sanitize HTML in users
5 years ago
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
5 years ago
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
5 years ago
Ivan Tashkinov 7c8003c3fc [#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
5 years ago
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
5 years ago
Haelwenn 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
5 years ago
rinpatch e87a32bcd7 rip out fetch_initial_posts
5 years ago
Haelwenn (lanodan) Monnier 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting
5 years ago
Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch d88c8a9614 Merge branch 'fix/cache-control-headers' into 'develop'
5 years ago
rinpatch 6a28c198af uploaded media plug: do not inject compile-time params on every request
5 years ago
rinpatch 38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop'
5 years ago
rinpatch 994ac4357c Merge branch 'fix/hashtags-streaming' into 'develop'
5 years ago
rinpatch 658f30c0b3 Merge branch 'static-accept-missing' into 'develop'
5 years ago
rinpatch fc4496d4fa rate limiter: disable based on if remote ip was found, not on if the plug was enabled
5 years ago
rinpatch 3e0f05f08e Merge branch 'bugfix/br-vs-newline' into 'develop'
5 years ago
Mark Felder c6eb1c1b92 Merge branch 'develop' into fix/cache-control-headers
5 years ago
Mark Felder 7321429a2e Lint
5 years ago
Mark Felder 3b1b183b42 Synchronize cache-control header for local media with the mediaproxy
5 years ago
Mark Felder 413177c8f0 Set correct Cache-Control header for local media
5 years ago
Mark Felder c62195127d Update comment to reflect what the code is actually doing
5 years ago
Mark Felder ad31d0726a Do not trust remote Cache-Control headers for mediaproxy
5 years ago
rinpatch 096c5c52e0 Merge branch 'revert/cache-control' into 'develop'
5 years ago
Egor Kislitsyn fffc382f13
Fix hashtags WebSocket streaming
5 years ago
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead
5 years ago
Alexander Strizhakov 98ed0d1c4b
more clean up
5 years ago
feld 802b991814 Merge branch 'exclude-posts-visible-to-admin' into 'develop'
5 years ago
Alexander Strizhakov 39ed608b13
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 1306b92997
clean up
5 years ago
Egor Kislitsyn d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Ivan Tashkinov bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
feld 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop'
5 years ago
rinpatch 7cdabdc0df Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
5 years ago
feld f92c447bbc Merge branch 'relay-list-change' into 'develop'
5 years ago
rinpatch c3b9fbd3a7 Revert "Set better Cache-Control header for static content"
5 years ago
Alexander Strizhakov fce090c1de
using Pleroma.Config instead of ets
5 years ago
Alexander Strizhakov 193d67cde5
compile fix
5 years ago
Alexander Strizhakov 282a93554f
merging release default config on app start
5 years ago
Haelwenn (lanodan) Monnier 863ec33ba2
Add support for funkwhale Audio activity
5 years ago
Ivan Tashkinov 5b696a8ac1 [#1560] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
Ivan Tashkinov 972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Mark Felder 5af798f246 Fix enforcement of character limits
5 years ago
Alexander Strizhakov f39e1b9eff
add verify tls_opts only when we open connection
5 years ago
Alexander Strizhakov 426f5ee48a
tesla adapter can't be changed in adminFE
5 years ago
Ivan Tashkinov 5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun
5 years ago
Maksim Pechnikov edb659dc57 Merge branch 'develop' into issue/1276
5 years ago
rinpatch 6cf1958b02 moderation log: fix improperly migrated data
5 years ago
Alexander Strizhakov 474ef512df wait in mix task while pleroma is rebooted
5 years ago
Alexander Strizhakov b2eb1124d1
Merge branch 'develop' into gun
5 years ago
rinpatch 6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop'
5 years ago
Alexander Strizhakov 5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
5 years ago
Alexander Strizhakov 78282dc983
little polishing
5 years ago
Alexander Strizhakov c93c3096d5
little refactor
5 years ago
Ivan Tashkinov 027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Ivan Tashkinov 40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions.
5 years ago
Alexander Strizhakov 058c9b01ac
returning, not needed
5 years ago
Alexander Strizhakov f0753eed0f
removing try block in tesla request
5 years ago
eugenijm ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode
5 years ago
lain 47604907c9 Merge branch 'proper_error_messages' into 'develop'
5 years ago
Haelwenn 927079e2ff Merge branch 'fix/stats-on-startup' into 'develop'
5 years ago
Alexander Strizhakov eb324467d9
removing try block in getting gun info
5 years ago
Mark Felder cdb05633a6 Generate instance stats on startup
5 years ago
feld 9b740cfb23 Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
5 years ago
lain 4bce13fa2f MastodonController: Return 404 errors correctly.
5 years ago
Alexander Strizhakov d6bebd4f9c
moving some logic to tesla adapter
5 years ago
lain 6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop'
5 years ago
Alexander Strizhakov 22d52f5691
same copyright date format
5 years ago
Alexander Strizhakov 6b2fb9160c
otp version
5 years ago
Mark Felder d9c5ae7c09 Update Copyrights for gun related files
5 years ago
Mark Felder 4427161ca3 Merge branch 'develop' into gun
5 years ago
Mark Felder 05da5f5cca Update Copyrights
5 years ago
Ivan Tashkinov b6fc98d9cd [#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago
Alexander Strizhakov 884d9710b2
refactoring for gun api modules
5 years ago
Alexander Strizhakov f98ee730f0
adapter renaming to adapter_helper
5 years ago
Alexander Strizhakov 8854770fc4
retry and retry_timeout settings default change
5 years ago
Alexander Strizhakov 1ad34bfdba
no try block in checkout connection
5 years ago
Alexander Strizhakov 24bf5c4e89
remove try block from pool request
5 years ago