Commit Graph

7033 Commits (b2fed59209a92624884df38a477837cba9a8dbd9)

Author SHA1 Message Date
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
Egor Kislitsyn 9cf4c4fa73
Remove vapidPublicKey from Nodeinfo
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'
5 years ago
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain 26d9c83316 SideEffects: Test for notification creation.
5 years ago
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
5 years ago
lain 372614cfd3 ChatView: Add a mastodon api representation of the recipient.
5 years ago
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
5 years ago
Haelwenn (lanodan) Monnier 46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
5 years ago
lain d45ae64858 ChatController: Use OAuth scopes.
5 years ago
Alexander Strizhakov 6cda360fea
don't restart postgrex
5 years ago
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
5 years ago
Haelwenn d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop'
5 years ago
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
5 years ago
Alexander Strizhakov 304ea09f4c
fix for logger configuration
5 years ago
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
5 years ago
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
5 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
5 years ago
lain f8c3ae7a62 ChatController: Handle pagination.
5 years ago
lain e983f70884 ChatMessagesHandling: Strip HTML of incoming messages.
5 years ago
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities
5 years ago
rinpatch 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
5 years ago
rinpatch 77ee64b993 user: remove blank?
5 years ago
lain 41fdcb7282 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain ca598e9c27 AccountView: Return user ap_id.
5 years ago
lain e2ced04917 ChatMessages: Better validation.
5 years ago
Alexander Strizhakov 72ef6cc4f2
added need_reboot endpoint to admin api
5 years ago
lain 3d4eca5dd4 CommonAPI: Escape HTML for chat messages.
5 years ago
Egor Kislitsyn cf4ebba774
Cleanup SubscriptionController
5 years ago
Maksim Pechnikov 4b3b1fec4e added an endpoint for getting unread notification count
5 years ago
Ivan Tashkinov bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
5 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
rinpatch 94240cac4e Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
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
Haelwenn b0a9a02af3 Merge branch 'feature/funkwhale-audio' into 'develop'
5 years ago
Haelwenn 01a3f145d5 Merge branch 'bugfix/funkwhale-channel' into 'develop'
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
rinpatch e99e2a86af Merge branch 'bugfix/profile-bio-newline' into 'develop'
5 years ago
lain c4d3ccc7b9 Merge branch 'admin-api-change-password' into 'develop'
5 years ago
feld 10b7b2b4a4 Merge branch 'fix/activity-deletion' into 'develop'
5 years ago
rinpatch 0e92aa0025 Merge branch '1364-notifications-sending-control' into 'develop'
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
Egor Kislitsyn 94a6590e3c
Partially restore `/api/statusnet/config.json`
5 years ago
Egor Kislitsyn 1c3f3a12ed
Add `characterLimit` and `vapidPublicKey` to nodeinfo
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
Egor Kislitsyn 3189c44a0c
Remove some TwitterAPI endpoints
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
rinpatch c46d035f7b rate limiter: disable based on if remote ip was found, not on if the plug was enabled
5 years ago
rinpatch 9d09755291 rip out fetch_initial_posts
5 years ago
rinpatch fcf51a77ba Merge branch 'features/staticfe-sanitization' into 'develop'
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
Haelwenn (lanodan) Monnier 306d633b40 pleroma_api_controller.ex: Improve conversations error reporting
5 years ago
rinpatch 0b823755a2 Merge branch 'fix/cache-control-headers' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 3f54215219 auth_controller.ex: Add admin scope to MastoFE
5 years ago
Egor Kislitsyn ffd636f109 Fix hashtags WebSocket streaming
5 years ago
Phil Hagelberg bd80ff9a6c Fix static FE plug to handle missing Accept header.
5 years ago
Haelwenn (lanodan) Monnier 5f9fbd7d33 Formatting: Do not use \n and prefer <br> instead
5 years ago
rinpatch 80bc8c2cc9 Revert "Set better Cache-Control header for static content"
5 years ago
feld e7837bc14e Merge branch 'fix/signup-without-email' into 'develop'
5 years ago
Mark Felder f8dc597c51 Fix enforcement of character limits
5 years ago
rinpatch 423cfaf141 Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
5 years ago
Alexander Strizhakov 7cf7083076 relay list shows hosts without accepted follow
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
Alexander Strizhakov aaa879ce75
proxy parsing errors
5 years ago
Alexander Strizhakov 6ebf389d6e
poolboy timeout fix
5 years ago
Alexander Strizhakov 8fc00b7cbf
return error if connection failed to open
5 years ago
Alexander Strizhakov 7d68924e4f
naming
5 years ago
Alexander Strizhakov e605e79df9
simplification of formatting host method
5 years ago
Alexander Strizhakov ee8071f0d5
removing unused method
5 years ago
Alexander Strizhakov 05429730e4
unnecessary with
5 years ago
Alexander Strizhakov d0e4d3ca3b
removing unnecessary with
5 years ago
Alexander Strizhakov 24d1ac125c
hiding raise error logic to otp_version module
5 years ago
Alexander Strizhakov 28ed4b41d0
naming for checkin from pool timeout
5 years ago
Alexander Strizhakov 151dc4e387 Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
5 years ago
Alexander Strizhakov 7eb6592992 Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
Alexander Strizhakov a21a66972f Apply suggestion to lib/pleroma/http/http.ex
5 years ago
Alexander Strizhakov 614e3934f9 Apply suggestion to lib/pleroma/http/http.ex
5 years ago
Alexander Strizhakov d30ff35d94 Apply suggestion to lib/pleroma/http/request_builder.ex
5 years ago
Alexander Strizhakov a3ad028973 Apply suggestion to lib/pleroma/http/adapter.ex
5 years ago
Alexander Strizhakov 2c8d80dc0a Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
Alexander Strizhakov 097ad10d02 Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
Alexander Strizhakov 4c8569d403
otp_version refactor
5 years ago
Alexander Strizhakov 509c81e4b1
Merge branch 'develop' into gun
5 years ago
Egor Kislitsyn 0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Ivan Tashkinov 99a6c660a9 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
eugenijm 7af431c150 Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
Egor Kislitsyn 4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
Haelwenn 764a50f8a6 Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
5 years ago
Alexander Strizhakov cc98d010ed
relay list shows hosts without accepted follow
5 years ago
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
5 years ago
Alexander Strizhakov d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 400fbc7629
wait in mix task while pleroma is rebooted
5 years ago
Alexander Strizhakov 34f1d09f3a
spec fix
5 years ago
Alexander Strizhakov ba87ed7335
fix for compiling
5 years ago
Alexander Strizhakov 32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
Phil Hagelberg 523f73dccd Fix static FE plug to handle missing Accept header.
5 years ago
rinpatch b5465bf385 timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
rinpatch ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
rinpatch 4d416343fa rate limiter: Fix a race condition
5 years ago
rinpatch df2173343a pagination: limit the number of elements returned at one time to 40
5 years ago
rinpatch 19e559fe51 Merge branch 'rate-limiter-runtime-settings' into 'develop'
5 years ago
Ivan Tashkinov c747260989 [#2250] Tiny refactoring per merge request review.
5 years ago
Alexander Strizhakov 814b275af7
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier 3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
5 years ago
Ivan Tashkinov 3759b146c4 Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
5 years ago
feld f2216287a7 Merge branch 'admin-status-list' into 'develop'
5 years ago
Ivan Tashkinov 6f2efb1c45 Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
Egor Kislitsyn cb60a9c42f
Do not fail when user has no email
5 years ago
eugenijm 4ab07cf0d5 Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
eugenijm e2a6a40367 Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
5 years ago
Egor Kislitsyn f446744a6a
Allow account registration without an email
5 years ago
Egor Kislitsyn 22018adae6
Fix Dialyzer warnings
5 years ago
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276
5 years ago
eugenijm 7ad5c51f23 Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Alexander Strizhakov 8efae966b1
open conn in separate task
5 years ago
lain 81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
Ivan Tashkinov 0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
Ivan Tashkinov 8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Alexander Strizhakov d44f9e3b6c
fix for timeout clause
5 years ago
Alexander Strizhakov f604f9e470
hackney pool timeout
5 years ago
Alexander Strizhakov 6806df80dd
don't log info ssl messages
5 years ago
Egor Kislitsyn 011ede4536
Update documentation
5 years ago
Alexander Strizhakov ad8f26c0a4
more info in Connections.checkin timout errors
5 years ago
Alexander Strizhakov a03c420b84
by default don't use gun retries
5 years ago
Alexander Strizhakov 13918cb545
Merge branch 'develop' into gun
5 years ago
Haelwenn c5570e0493 Merge branch 'single_emoji_reaction' into 'develop'
5 years ago
Egor Kislitsyn 819cd46717
Auto-expire Create activities only
5 years ago
lain 3eddd9caa6 Merge branch 'require-signature' into 'develop'
5 years ago
lain c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
5 years ago
Ivan Tashkinov 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop'
5 years ago
Ivan Tashkinov 3432294657 [#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3
5 years ago
lain 314928333a Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
Alexander Strizhakov c9db0507f8
removing retry option and changing some logger messages levels
5 years ago
Mark Felder 7d73e7a09a Spelling
5 years ago
Mark Felder cf94349287 Merge branch 'develop' into gun
5 years ago
lain cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop'
5 years ago
Ivan Tashkinov 61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain 3fa2ac68df Merge branch 'chore/standardize-mrf-behavior' into 'develop'
5 years ago
lain c07efd5b42 Merge branch 'need-reboot-flag' into 'develop'
5 years ago
Egor Kislitsyn 2ef70b55f5
Fix `status.expires_at` type
5 years ago
Alexander Strizhakov 514c899275
adding gun adapter
5 years ago
Maksim Pechnikov 28701c08ad Merge branch 'develop' into issue/1276
5 years ago
rinpatch 472132215e Use floki's new APIs for parsing fragments
5 years ago
Ivan Tashkinov 269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
Haelwenn (lanodan) Monnier 1257331291
MastodonAPI.StatusView: Do not use site_name
5 years ago
Mark Felder 478619782b Standardize @behaviour usage in MRFs
5 years ago
Egor Kislitsyn 57878f8708
Improve readability
5 years ago
Egor Kislitsyn 4d459b0e99
Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4
5 years ago
Egor Kislitsyn 241a3d744a
Add ActivityExpirationPolicy
5 years ago
rinpatch 9906c6fb6f Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
5 years ago
Maksim Pechnikov 6f9839c73c Merge branch 'develop' into issue/1276
5 years ago
rinpatch 23049a077e NodeInfo: Fix federating status not being reported when MRF
5 years ago
feld b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
5 years ago
Maksim Pechnikov da44ee5b0f Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn 19516af74e
Fix `status.expires_in` validation
5 years ago
Mark Felder ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links"
5 years ago
Egor Kislitsyn 50d9fcbe29
Hotlink logo instead of attachment
5 years ago
feld 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
5 years ago
rinpatch ea1631d7e6 Make Floki use fast_html
5 years ago
lain 24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
Egor Kislitsyn 6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
Maksim Pechnikov 58574ef156 Merge branch 'develop' into issue/1276
5 years ago
rinpatch 94e5ca1105 Merge branch 'issue/1383' into 'develop'
5 years ago
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383
5 years ago
rinpatch c55301e760 Fix a compilation error under certain circumstances
5 years ago
Maksim Pechnikov 3830cb538b removed a comments
5 years ago
Maksim Pechnikov cd040691bd maked `unread_count` as virtual field
5 years ago
Maksim Pechnikov b87533760b Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov 24e49d14f2 [#1505] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
5 years ago
Ivan Tashkinov 6ea3c06d8d [#1505] Minor refactoring.
5 years ago
Ivan Tashkinov 7c3991f59e [#1505] Fixed `replies` serialization (included objects' ids instead of activities' ids).
5 years ago
Ivan Tashkinov 4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Ivan Tashkinov d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
5 years ago
lain 964b4d82a0 Merge branch 'fix/upload-limit-otp' into 'develop'
5 years ago
Alexander Strizhakov dad23e3766
need_reboot flag
5 years ago
rinpatch 15ea75cd2a Actually fix upload limit on OTP releases
5 years ago
Haelwenn 1262357ddb Merge branch 'cancel-follow-request' into 'develop'
5 years ago
Lain Soykaf d85bcc8627 Questions: Add timezone to `closed` property
5 years ago
Lain Soykaf 4538a1ee01 EmojiReactions: Remove old API endpoints
5 years ago
Lain Soykaf f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
Egor Kislitsyn bc2e98b200
Add User.get_follow_state/2
5 years ago
Lain Soykaf 8a79f20c21 EmojiReactions: Rename to EmojiReacts
5 years ago
feld df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop'
5 years ago
Egor Kislitsyn 8b9742ecf5 Cancellation of a follow request for a remote user
5 years ago
Alexander Strizhakov c85aa6e87f
removing confusing error
5 years ago
rinpatch 15cb1f6804 Merge branch 'fix/unpinnable-polls' into 'develop'
5 years ago
rinpatch 72d767998c Merge branch 'removing-admin-api-endpoint' into 'develop'
5 years ago
feld b21e59da5f Merge branch 'remove-linker-scheme-option' into 'develop'
5 years ago
Alexander Strizhakov 5db6ac8ee4
removing migrate_from_db endpoint from admin api
5 years ago
Egor Kislitsyn 3909b5b7b3
Remove AutoLinker `scheme` option from the config
5 years ago
rinpatch 49e80a1537 Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
5 years ago
Egor Kislitsyn 8c71f7e11a Add support for cancellation of a follow request
5 years ago
Ivan Tashkinov e84fee5b86 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Maksim Pechnikov 2c40c8b4a2 Merge branch 'develop' into issue/1383
5 years ago
rinpatch 50f5a92021 fix not being able to pin polls
5 years ago
rinpatch 983a87175e mastodon API: do not sanitize html in non-html fields
5 years ago
Roman Chvanikov 8057157ee3 Make attachments cleanup optional
5 years ago
rinpatch c27d1d65bf Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
5 years ago
rinpatch 5b62acf6e9 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
lain 774cba84f5 Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
5 years ago
lain a0d9d42eaa Emoji Reactions: Actually use the validation.
5 years ago
feld e2f2602fdc Merge branch 'emoji-api-errors' into 'develop'
5 years ago
feld df200ea7a4 Merge branch 'http-security-warning' into 'develop'
5 years ago
feld b3e9c87724 Update emoji_api_controller.ex
5 years ago
feld 36becd5573 Update http_security_plug.ex
5 years ago
rinpatch 263abe3ba5 Merge branch 'emoji-reactions-reacted' into 'develop'
5 years ago
rinpatch 889965141a RemoteIp: only trust X-Forwarded-For
5 years ago
Haelwenn 946de2299c Merge branch 'fix-streaming-reblog' into 'develop'
5 years ago
Egor Kislitsyn e07e7888d7
Fix credo warning
5 years ago
Egor Kislitsyn 2bd4d6289b
Make the warning more scarier
5 years ago
Alexander Strizhakov e7fee0d6fa
emoji api error on not writable dir
5 years ago
lain b3a877d6c9 Emoji Reactions: Correctly handle deleted users
5 years ago
lain a802e07241 Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
Alexander Strizhakov 1f4fbe9d98
title parse improvement
5 years ago
Maksim Pechnikov ba5e8a6444 Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383
5 years ago
lain cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
5 years ago
lain 12b6fcdb8c Merge branch 'features/task-test-email' into 'develop'
5 years ago
lain 2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop'
5 years ago
Alexander Strizhakov 7bd4c14581
meta tag parser respect first title header
5 years ago
lain d385789a45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
5 years ago
Haelwenn 271935953a Merge branch 'whole-db-removal' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 4eb935be78
Create pleroma.email mix task
5 years ago
lain 77f24525ca Streamer: Correctly handle reblog mutes
5 years ago
Egor Kislitsyn 6302b40791
Warn if HTTPSecurityPlug is disabled
5 years ago
feld d9cb8acd3e Merge branch 'fix/attachments-cleanup' into 'develop'
5 years ago
Roman Chvanikov d18a2e4e36 Add test for custom base_url when deleting an attachment
5 years ago
Roman Chvanikov 804a702f97 Fix base_url string trimming
5 years ago
Roman Chvanikov dea968463d Add logging
5 years ago
lain 46915207b6 Remove `whole_db` parameter everywhere, it's not used anymore
5 years ago
lain e3fae3380e Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
5 years ago
Roman Chvanikov 7f78bd7e37 Fix __MODULE__ usage
5 years ago
lain 95afcae194 Merge branch 'support/update_ecto' into 'develop'
5 years ago
lain 4f004ab92e Merge branch 'fix/attachments-cleanup' into 'develop'
5 years ago
Maksim Pechnikov 02c3dd2e3d update ecto
5 years ago
Roman Chvanikov eb4870e1cd Remove unused var
5 years ago
Roman Chvanikov 52e08ec9fd explicitly describe perform op in AttachmentsClenupWorker
5 years ago
Maksim Pechnikov bcffa662dc Merge branch 'develop' into feature/tag_feed
5 years ago
Hakaba Hitoyo dabd535e43 Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov e442ea5722 Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov bfc70fdf29 Merge branch 'develop' into issue/1383
5 years ago
Roman Chvanikov 86c4b76bf0 Fix typo
5 years ago
feld 36838b516f Merge branch 'fix/runtime-config' into 'develop'
5 years ago
Mark Felder d770cffce0 Merge branch 'develop' into issue/1280
5 years ago
Alexander Strizhakov e93cc561cd
restarting pleroma from outside application
5 years ago
Ivan Tashkinov 86e4d23acb [#1505] Background fetching of incoming activities' `replies` collections.
5 years ago
Alexander Strizhakov de4102b247
can be changed in runtime
5 years ago
Maksim Pechnikov 99c0a11c58 added atom feed
5 years ago
Maksim Pechnikov 055edd3d72 Merge branch 'develop' into feature/tag_feed
5 years ago
rinpatch 8533b63d1f Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
5 years ago
rinpatch 0fceeb44b3 Merge branch 'emoji-reaction-sanity-check' into 'develop'
5 years ago
lain 347f3ed2c6 Emoji reactions: Change api format once more
5 years ago
Alexander Strizhakov 6a0f0ac4a2
fix for non existing atom
5 years ago
Maksim Pechnikov 293281fcbd Merge branch 'develop' into feature/tag_feed
5 years ago
Alexander Strizhakov 6cd2e851d9
parsing Swoosh modules
5 years ago
Maksim Pechnikov 8589632d09 fixed delete ScheduledActivity
5 years ago
lain 34fc0ca053 Emoji reactions: Add sanity checks for the cache
5 years ago
Maksim Pechnikov 2cfe1b9385 Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov 5fc2fa8908 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov ce7c887a27 removed try/rescue
5 years ago
Maksim 6f77b77428 Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
5 years ago
Haelwenn dddebee047 Merge branch 'emoji-notifications' into 'develop'
5 years ago
Mark Felder e151dea276 Merge branch 'develop' into feature/new-registrations-digest
5 years ago
Mark Felder ae78059ff4 Merge branch 'develop' into features/remote-follow-userpage-redirect
5 years ago
lain 615b72238e Notifications: Add emoji reaction notifications
5 years ago
Ivan Tashkinov cf96c40057 [#1505] Added Mastodon-compatible `replies` collection to Note federated representation.
5 years ago
rinpatch 6e6f1ead31 Merge branch 'no-error-404' into 'develop'
5 years ago
Maksim Pechnikov cf19bf3c7c Merge branch 'develop' into issue/1383
5 years ago
minibikini 7c0ac54437 Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
5 years ago
Egor Kislitsyn 5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
feld be27777156 Merge branch 'admin-be' into 'develop'
5 years ago
Egor Kislitsyn b6f5b326e7
Fix credo warnings
5 years ago
Egor Kislitsyn aa0f0d4edd
Disable NewUsersDigestEmail by default
5 years ago
Egor Kislitsyn df0b8f1d08
Add new users digest email
5 years ago
rinpatch 34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop'
5 years ago
lain dd3fc50ea4 Emoji reactions: Change cache and reply format
5 years ago
Alexander Strizhakov d5f8a88a37
support for updating env after settings deletion
5 years ago
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 5ea8596448 Merge branch 'develop' into feature/tag_feed
5 years ago
Roman Chvanikov 22e94bb2c7 Merge branch 'develop' into fix/attachments-cleanup
5 years ago
Haelwenn (lanodan) Monnier 7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
5 years ago
Alexander Strizhakov f01ab6cd29
some refactor and tests
5 years ago
rinpatch 04c9ca5d68 Merge branch 'emoji-reaction-extensions' into 'develop'
5 years ago
Alexander Strizhakov 503d966e9f
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov dcae5914d1
fix for db key
5 years ago
Maksim Pechnikov 41e2332007 Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov 6e88a7e591 exclude blocked user posts from search results
5 years ago
lain 7d8b709d29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
rinpatch 00d08c9231 Merge branch 'favoritng-responses' into 'develop'
5 years ago
Alexander Strizhakov 8023fa48db
merge fix
5 years ago
lain 4c5b5f14dc StatusView: Add `emoji_reactions`
5 years ago
lain 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop'
5 years ago
lain 42ea480e95 Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
5 years ago
lain 510776ba31 CommonAPI: Don't error out on double favs/repeats
5 years ago
lain c814f22030 Merge branch 'fix-admin-api-scope' into 'develop'
5 years ago
lain 5fddf988ea Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
Haelwenn e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5
5 years ago
rinpatch 9367b70f37 Merge branch 'features/cleanup-incoming-actor' into 'develop'
5 years ago
rinpatch dc0498ab2b Check for unapplied migrations on startup
5 years ago
Roman Chvanikov cde828ff7d Fix credo warning
5 years ago
Roman Chvanikov d6a532bf0f Delete attachments asynchronously
5 years ago
Haelwenn (lanodan) Monnier 6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
5 years ago
Alexander Strizhakov efb8ef5abe
releases support
5 years ago
Alexander Strizhakov e699861690
full update for some subkeys
5 years ago
Roman Chvanikov 81133702d4 Delete attachments after object and cache cleanup
5 years ago
Alexander Strizhakov 89e93fb33f
return db key on update requests
5 years ago
Alexander Strizhakov 7676ed8239
some clean up
5 years ago
Maksim Pechnikov 108a39c876 updated error messages for authentication process
5 years ago
Alexander Strizhakov 58e8963824
fix for config loader
5 years ago
Alexander Strizhakov 60ba2339a2
saving to DB only added by user settings
5 years ago
Alexander Strizhakov 29155137fd
renaming
5 years ago
Maksim Pechnikov a5db044e57 Merge branch 'develop' into feature/tag_feed
5 years ago
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain aa9fe3a712 Merge branch 'develop' into 'feature/tag_feed'
5 years ago
Alexander Strizhakov 59ba5c80b9
little cleanup
5 years ago
Egor Kislitsyn 3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
Ivan Tashkinov 76c1948880 [#1478] Adjusted AdminAPIController admin subscope requirements.
5 years ago
Maksim Pechnikov c9f45edeac Merge branch 'develop' into feature/tag_feed
5 years ago
Roman Chvanikov 0709757e47 Check if object->data is array when looking up attachment objects to delete
5 years ago
lain 2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov b7908844f2 Merge branch 'develop' into issue/1383
5 years ago
Roman Chvanikov 88f0eed0f2 Delete attachments when status is deleted
5 years ago
feld 8b4d81609d Merge branch 'updated-at-on-conversation-read' into 'develop'
5 years ago
feld bb5862ea2f Merge branch 'issue/1354' into 'develop'
5 years ago
Mark Felder 2f5b8fbeb3 Merge branch 'develop' into issue/1354
5 years ago
feld ea4a462858 Merge branch 'issue/1487' into 'develop'
5 years ago
Hakaba Hitoyo 0c9c62509d Remove MDII uploader
5 years ago
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov d933fd3d61
more renamings
5 years ago
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
5 years ago
Alexander Strizhakov 958d0452e4
fix for pleroma assets group update
5 years ago
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain 05ca420c09 Merge branch 'issue/1490' into 'develop'
5 years ago
Alexander Strizhakov 88a16bb9fc
deep merge in config update
5 years ago
Alexander c841174de8
flag for delete fix
5 years ago
Alexander 0b02040327
little fixes and typos fix
5 years ago
Alexander 9c1f3bfeff
fixes for logger backends
5 years ago
Alexander cda2c1fc63
fix for subgroup tuple
5 years ago
Alexander 063ab6d911
logger backends fix
5 years ago
Alexander 583cee4607
parsing proxy url setting
5 years ago
Alexander a71393dd29
fix for endpoints after env update
5 years ago
Alexander fea734ca70
errors on endpoints
5 years ago
Alexander 5cacb988b9
partially settings update
5 years ago
Alex S 2753285b77
config editing through database
5 years ago
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Maksim Pechnikov 70410dfafd fix create service actor
5 years ago
eugenijm 0b6d1292d2 Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
5 years ago
Maksim Pechnikov fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
Ivan Tashkinov badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Maksim Pechnikov 933dc12043 added code of mr#2067
5 years ago
Maksim Pechnikov 385356aad0 fix oauth scopes for AdminApi#reports_update
5 years ago
Maksim Pechnikov bdd71669da update test
5 years ago
Maksim 4c505bc615 Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
Maksim c9a44ec4a6 Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
5 years ago
Maksim Pechnikov 5b84156013 moved remote follow in separate controller
5 years ago
Maksim Pechnikov 54c9db38c8 Merge branch 'develop' into issue/1383
5 years ago
rinpatch c51e93978e Merge branch 'feature/custom-runtime-modules' into 'develop'
5 years ago
Maxim Filippov e71a13ad57 Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
5 years ago
Mark Felder 06ae56a3ae Posts without media attachments should get the Summary TwitterCard
5 years ago
feld a54aa5af43 Merge branch 'feature/status-counts-by-scope' into 'develop'
5 years ago
Maksim Pechnikov 7bd0bca2ab fixed remote follow
5 years ago
Maxim Filippov 5fc84552d3 Fix all count
5 years ago
Ivan Tashkinov ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov 455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests.
5 years ago
Egor Kislitsyn 34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Egor Kislitsyn 775212121c
Verify HTTP signatures only when request accepts "activity+json" type
5 years ago
Egor Kislitsyn 432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
Maxim Filippov 404a9ccb9a Stats: return status counts by scope
5 years ago
Maksim Pechnikov b53573a837 add tag feeds
5 years ago
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support
5 years ago
Egor Kislitsyn 6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
Maxim Filippov 45180d4c60 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
Egor Kislitsyn 8f79f433bc
Hide follower counter when hiding is activated
5 years ago
Maksim Pechnikov a879c396bb Merge branch 'develop' into feature/tag_feed
5 years ago
Egor Kislitsyn b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn a12b6454bb
Add an option to require fetches to be signed
5 years ago
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov eb11c60289 Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
Phil Hagelberg 02c3031e99 Don't log when users or objects are deleted.
5 years ago
rinpatch bcd16676a7 Publisher: check out a connection for inserting publish_one jobs
5 years ago
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
lain 2f31cef71f Merge branch 'feature/native-captcha' into 'develop'
5 years ago
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
5 years ago
Egor Kislitsyn e536796984 Add native captcha and enable it by default.
5 years ago
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
5 years ago
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411
5 years ago
Maxim Filippov 82fae3e23f AdminAPI: Merge account views for list instance statuses
5 years ago
Egor Kislitsyn ee6805850c Set log level to debug for not important messages
5 years ago
rinpatch 72f3b22134 Merge branch 'domain-block-precedence' into 'develop'
5 years ago
Sadposter 1ad96d667a remove single-step pipe
5 years ago
lain 1f498ba2bb Merge branch '1427-oauth-admin-scopes' into 'develop'
5 years ago
Ivan Tashkinov 3920244be5 [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
5 years ago
Sadposter 457821adb0 Apply suggestion to lib/pleroma/user.ex
5 years ago
feld 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop'
5 years ago
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
5 years ago
Sadposter 25f774f7c1 format activity_pub.ex
5 years ago
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities
5 years ago
Egor Kislitsyn 75b419d7c8 Do not apply http signature pipeline to the unsubscribe route
5 years ago
minibikini 43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules'
5 years ago
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Egor Kislitsyn a37bd5c255 Change log level
5 years ago
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
5 years ago
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
5 years ago
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results
5 years ago
Egor Kislitsyn b7a57d8e38 Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
5 years ago
Egor Kislitsyn c098dec473 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Maksim Pechnikov 2b821036c4 Merge branch 'develop' into issue/1383
5 years ago
lain 0d2c13a119 Merge branch 'fix/otp-parsers' into 'develop'
5 years ago
lain b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
5 years ago
lain e4ea0e20b3 Merge branch 'issue/1342' into 'develop'
5 years ago
lain a5e28bf214 Merge branch 'develop' into 'fix/oauth-compile-time'
5 years ago
Egor Kislitsyn 78299ab182 Set Plug.Logger to log at `:debug` level
5 years ago
Egor Kislitsyn ed92784e7c Set Logger level to :info in prod
5 years ago
Egor Kislitsyn 84f891ea3e Add Pleroma.Utils.compile_dir/1
5 years ago
lain d4bafabfd1 Beginnings of the create validator
5 years ago
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342
5 years ago
rinpatch 3c45ed4f47 OTP: Fix runtime upload limit config being ignored
5 years ago
rinpatch d6c89068f3 HTML: Compile Scrubbers on boot
5 years ago
Maksim Pechnikov 6fbafb1cdc Merge branch 'develop' into issue/1276
5 years ago
rinpatch bd3aa8500c OAuth token cleanup: Get rid of compile-time configuration
5 years ago
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383
5 years ago
rinpatch af5fef1f22 Merge branch 'fix/clause-never-matches' into 'develop'
5 years ago
rinpatch a21340caa1 Fix never matching clause
5 years ago
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
5 years ago
rinpatch 29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
5 years ago
Maxim Filippov a7f77785c2 Implement report notes destruction
5 years ago
Ivan Tashkinov 1770602747 [#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
5 years ago
Ivan Tashkinov 40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests.
5 years ago
rinpatch 6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop'
5 years ago
Ivan Tashkinov 93a80ee915 [#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
5 years ago
lain e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
5 years ago
Egor Kislitsyn a75d4a41e0 Add a test for custom runtime modules
5 years ago
Maxim Filippov 08c89fd2b8 Fix incorrect report count
5 years ago
Egor Kislitsyn e4292cbfad Use Kernel.inspect/2 to print loaded custom modules
5 years ago
Egor Kislitsyn 157bceeda9 Move runtime configuration from `:instance` to `:modules`
5 years ago
Maksim Pechnikov 22fc271e23 init tag feed
5 years ago
Ivan Tashkinov 13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov af42c00cff [#1427] Reworked admin scopes support.
5 years ago
rinpatch cdff5b8267 Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch 9f99640cfc ActivityPub: Fix deletes being exempt from MRF
5 years ago
lain 67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop'
5 years ago
feld d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop'
5 years ago
Egor Kislitsyn 1216b546c6 Fix credo warning
5 years ago
Egor Kislitsyn 48ae3c4347 Add support for custom modules
5 years ago
Maksim Pechnikov 3fe7a1fd35 Merge branch 'develop' into issue/1342
5 years ago
lain 1993d7096d Validators: Add a type for the datetime used in AP.
5 years ago
Maksim Pechnikov 49bb0a130f Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov e21afdb7c7 Merge branch 'develop' into issue/1411
5 years ago
Maksim Pechnikov 3c3bba0b7c fix ScheduledActivity
5 years ago
Ivan Tashkinov d3bce89edd [#1335] Merge issue fix.
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain e9993acdbb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
lain aa97fe8f17 ChatChannel: Ignore messages that are too long.
5 years ago
Maksim Pechnikov 3a0a400fe1 add @type to ScheduledActivity
5 years ago
Maksim Pechnikov 29a98b86b7 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov 652cc6ba4b updated ScheduledActivity
5 years ago
Egor Kislitsyn 05fb8d0084 Fix Pleroma.FollowingRelationship.move_following/2
5 years ago
Maxim Filippov 4b60d41db9 Add report notes
5 years ago
Egor Kislitsyn 624e720aa4 Add `with_move` query param to the notifications API
5 years ago
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
Egor Kislitsyn cf52106e05
Update Floki dependency
5 years ago
Maksim Pechnikov 88f7cf51d4 Merge branch 'develop' into issue/1411
5 years ago
rinpatch 0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop'
5 years ago
kPherox 0326683932
hide follower/following for friendica
5 years ago
Ivan Tashkinov 51111e286b [#1427] Initial support for OAuth admin scopes.
5 years ago
Egor Kislitsyn a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2
5 years ago
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maksim Pechnikov 04a8ffbe84 added privacy option to push notifications
5 years ago
Maksim Pechnikov a52da55eb9 added User.NotificationSetting struct
5 years ago
Maksim Pechnikov b7c449118b Merge branch 'develop' into issue/1383
5 years ago
Sadposter c7cc80a9ee obligatory format commit
5 years ago
Sadposter fa97eddf8a make follows take precedence over domain blocks
5 years ago
Maxim Filippov fcabcab443 Fetch account from report, not from status (it might be deleted)
5 years ago
Maxim Filippov 5135656f57 Handle reopened reports with deleted statuses
5 years ago
lain 50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
lain f36724efb1 User: Never return nil for user follower counts.
5 years ago
Maksim Pechnikov a4f834a687 moved DigestEmail to Oban Periodic jobs
5 years ago
Egor Kislitsyn f595cfe623
Remove User.user_info/2
5 years ago
Egor Kislitsyn 1fc28a4b44
Add a view for the move notification
5 years ago
Maksim Pechnikov c5766a8100 moved ActivityExpiration to Oban Periodic jobs
5 years ago
Maksim Pechnikov 6f202a401b moved ScheduledActivity to Oban Periodic jobs
5 years ago
Egor Kislitsyn 4af69f047d
Remove `account` field from web push payload
5 years ago
Egor Kislitsyn 80ededc04f
Add `direct_conversation_id` to web push payload
5 years ago
Maksim Pechnikov ac3abb5414 moved Pleroma.Stats to Oban Periodic jobs
5 years ago
Ivan Tashkinov c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maxim Filippov b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
lain dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
5 years ago
Maxim Filippov b3b4e5ca80 AdminAPI: Grouped reports old/new fix
5 years ago
Maxim Filippov 1364d303f8 AdminAPI: Fix grouped reports for closed/resolved reports
5 years ago
rinpatch 4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
rinpatch 02f7383891 ActivityPub controller: do not render remote users
5 years ago
feld 5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
5 years ago
feld 9374b52756 Merge branch 'fix/update-reports-old-format' into 'develop'
5 years ago
Maksim Pechnikov 0e9be6bafa moved OAuth.Token.CleanWorker to Oban Periodic jobs
5 years ago
Sadposter d3656c2725 add ability to set a custom user-agent string
5 years ago
Maxim Filippov 82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 40059c9b1e Typo
5 years ago
Maxim Filippov 2b341627da Admin API: Render whole status in grouped reports
5 years ago
rinpatch 9f29930440 fetcher: move local object checking into a reusable function
5 years ago
Ivan Tashkinov 1636cc5b7e Removed users.info and remaining usages.
5 years ago
lain bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
5 years ago
Maxim Filippov b64c7b35d4 Swap map with each
5 years ago
lain 19b727bf8f Merge branch 'fix/mix-task-logging' into 'develop'
5 years ago
Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 8feb5dcb42 Merge branch 'issue/1348' into 'develop'
5 years ago
lain 320690f7a5 Object: Use inspect to log missing preload.
5 years ago
Egor Kislitsyn d38ab4bb89
Fix user.following_count
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Ivan Tashkinov 555edd01ab [#1335] User AP ID relations fetching performance optimizations.
5 years ago
Ivan Tashkinov 565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
Maksim Pechnikov 708fd234bd fix order favorites activites
5 years ago
Maxim Filippov 46eb160135 AdminAPI: Confirm user account, resend confirmation email
5 years ago
Egor Kislitsyn 36686f5245
Support authentication via `x-admin-token` HTTP header
5 years ago
Maksim Pechnikov 5cee51fac5 fix `order by` for fetch_favorites
5 years ago
Ivan Tashkinov 3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
Maksim Pechnikov 0937895182 updated fetch_favorites
5 years ago
Maksim Pechnikov 9da4c88b49 fix test
5 years ago
Maksim Pechnikov 4beb3ce5c5 /api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
Maxim Filippov c506cc48ef Admin API: Error when trying to update reports in the "old" format
5 years ago
kaniini 81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop'
5 years ago
Maksim Pechnikov b9041c2097 added recount unread notifications to markers
5 years ago
Ivan Tashkinov 01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov c31ddce51e [#1335] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
rinpatch 22554ac5ca Merge branch 'bugfix/1395-email-activation' into 'develop'
5 years ago
lain f17e0f8e4f OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
5 years ago
kPherox 72d2557e11 Add fieldsLimit to metadata of nodeinfo
5 years ago
Ariadne Conill eecd64cc07 object age policy: remove debug logging
5 years ago
Ariadne Conill 5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
Maxim Filippov 114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov 30af5da330 Admin API: list all statuses from a given instance
5 years ago
rinpatch 09b4f7269e Merge branch 'fix/conversations-rendering' into 'develop'
5 years ago
rinpatch 94f1cfced8 format the code
5 years ago
feld 1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
5 years ago
Egor Kislitsyn 3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
rinpatch 6085c71bd1 Merge branch 'reactions' into 'develop'
5 years ago
Phil Hagelberg 3c60adbc1f Support redirecting by activity UUID in static FE as well.
5 years ago
Phil Hagelberg 0867cb083e Support redirecting by object ID in static FE.
5 years ago
lain facc37aaa6 Merge branch 'static-remote-redirect' into 'develop'
5 years ago
Phil Hagelberg 62f3a93049 For remote notices, redirect to the original instead of 404.
5 years ago
Maksim Pechnikov b5b62f42b2 update Marker.multi_set_unread_count
5 years ago
Egor Kislitsyn 768c1a5de1
Fix tests
5 years ago
Egor Kislitsyn 27cd1374e3
Add a notification for Move activities
5 years ago
Egor Kislitsyn e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
lain e835cd97f6 Containment: Add a catch-all clause to contain_origin.
5 years ago
Mark Felder 7d101bc9c5 Fix rendering conversations when there's a malformed status
5 years ago
eugenijm f86a7d5d8b Fix exclude_visibilities filter for followers-only Like notifications
5 years ago
feld e27d78e768 Merge branch 'nodeinfo-federation-enabled' into 'develop'
5 years ago
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop'
5 years ago
href b39b49cc14 report federating status in nodeinfo
5 years ago
Maksim Pechnikov ddbfc995ac clean sql query
5 years ago
lain 1ca7b877a1 Merge branch 'iss-1376' into 'develop'
5 years ago
lain 417f9a782f Merge branch 'fix/1399' into 'develop'
5 years ago
Steven Fuchs 94627baa5c New rate limiter
5 years ago
lain f6056e9c9c UserEnabledPlug: Don't authenticate unconfirmed users.
5 years ago
lain 8521553ad9 User: Don't let deactivated users authenticate.
5 years ago
Ivan Tashkinov 5cf2c7422b [#1335] Applied code review suggestions.
5 years ago
Maxim Filippov 46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov 31343e4321 Code style fixes
5 years ago
Alexander 6a4201e0b4
fix for migrate task
5 years ago
Ivan Tashkinov 3db988250b [#1335] User: refactored :blocks field into :blocked_users relation.
5 years ago
lain a88e834dba Merge branch 'develop' into 'reactions'
5 years ago
lain 3a1aaadc18 Merge branch 'issue/1339' into 'develop'
5 years ago
Maksim Pechnikov 9d0b989521 add subject to atom feed
5 years ago
Phil Hagelberg 3cc49cdb78 Formatter moved to new module.
5 years ago
Phil Hagelberg ef7c3bdc7a Add some further test cases.
5 years ago
Phil Hagelberg 4729027f91 Prevent non-local notices from rendering.
5 years ago
Phil Hagelberg 886a07ba57 Move static_fe config to its own section instead of in :instance.
5 years ago
Phil Hagelberg b0080fa730 Render errors in HTML, not with JS.
5 years ago
Phil Hagelberg e27c61218d Expand subject content automatically when config is set.
5 years ago
Phil Hagelberg bfd5d79826 Include metadata in static FE conversations and profiles.
5 years ago
Phil Hagelberg 828259fb65 Catch 404s.
5 years ago
Phil Hagelberg df2f59be91 Pagination for user profiles.
5 years ago
Phil Hagelberg 8969c5522d Make many of the improvements suggested in review.
5 years ago
Phil Hagelberg e8bee35578 Static FE plug should only respond to text/html requests.
5 years ago
Phil Hagelberg dc3b87d153 Move static FE routing into its own plug.
5 years ago
Phil Hagelberg c6c706161e Make sure notice link is remote if the post is remote.
5 years ago
Phil Hagelberg 274cc18e8a Visually separate header.
5 years ago
Phil Hagelberg 2ac1ece652 Fix a bug where reblogs were displayed under the wrong user.
5 years ago
Phil Hagelberg 5d7c44266b Change date formatting.
5 years ago
Phil Hagelberg 1dc785b74b Move static-fe CSS to a separate file.
5 years ago
Phil Hagelberg e4b9784c39 Show counts for replies, likes, and announces for selected notice.
5 years ago
Phil Hagelberg 93e9c0cedf Format dates using CommonAPI utils.
5 years ago
Phil Hagelberg 918e1353f6 Add header to profile/notice pages linking to pleroma-fe.
5 years ago
Phil Hagelberg 33a26b61c3 Remove activity/user representer; move logic to controller.
5 years ago
Phil Hagelberg 41fde63def Get rid of @data in views and use separate fields.
5 years ago
Phil Hagelberg e944a2213d Use gettext for sensitive media warning.
5 years ago
Phil Hagelberg 2d1897e8a7 Apply all suggested changes from reviewers.
5 years ago
Phil Hagelberg cc1b07132f Notices should show entire thread from context.
5 years ago
Phil Hagelberg 748d800acb Show images, video, and audio attachments to notices.
5 years ago
Phil Hagelberg 1d8950798c Fix activity_representer to work with User.get_or_fetch returning tuple.
5 years ago
Phil Hagelberg 0cf04e1088 Fix OStatus controller to know about StaticFEController.
5 years ago
Phil Hagelberg e79d8985ab Don't show 404 in static-fe controller unless it's actually not found.
5 years ago
Phil Hagelberg c1fc139986 Add permalinks to the static-fe notice rendering.
5 years ago
Phil Hagelberg d1320160f4 Looks like source_data is on user directly now.
5 years ago
William Pitcock ca5ef201ef static fe: add remote follow button
5 years ago
William Pitcock b33fbd58e3 static fe: add support for message subjects
5 years ago
William Pitcock e2904b5777 static fe: reformat activity representer
5 years ago
William Pitcock 2b5bd5236d static fe: add user profile rendering
5 years ago
William Pitcock 8f08da750a static fe: use a generic activity representer to render activities
5 years ago
William Pitcock ff8d0902f3 static fe: formatting
5 years ago
William Pitcock a4d3a8ec03 static fe: proof of concept
5 years ago
Ariadne Conill 5b60d82592 object containment: handle all cases where ID is invalid (missing, nil, non-string)
5 years ago
Ariadne Conill 532fd38b12 nodeinfo: add multifetch feature (ref pleroma-fe!977).
5 years ago
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maxim Filippov b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov 7258db023e Support old flag format
5 years ago
eugenijm 7888803ffe Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
rinpatch 32afa07995 Fetcher: fix local check returning unwrapped object
5 years ago
rinpatch 802d249827 Merge branch 'fix/trailing-format-plug-oauth' into 'develop'
5 years ago
rinpatch 365657320c Fix TrailingFormatPlug not being active for /api/oauth_tokens
5 years ago
rinpatch 84175fe30e Set better Cache-Control header for static content
5 years ago
feld 8b19464176 Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
5 years ago
Maxim Filippov f171095960 Grouped reports with status data baked in
5 years ago
rinpatch 54746c6c26 Object Fetcher: set cache after reinjecting
5 years ago
AkiraFukushima e1fc6cb78f Check client and token in GET /oauth/authorize
5 years ago
lain 1bd1f62af5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
lain faced6236b NoteValidator: Add very basic validator for Note objects.
5 years ago
lain 3d1b445cbf Object Validators: Extract common validations.
5 years ago
Maksim Pechnikov e52955c961 update following_relationship.ex
5 years ago
Maksim Pechnikov 62bc0657e7 excluded invisible users from search results
5 years ago
Maxim Filippov 2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset
5 years ago
Maxim Filippov 43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maksim Pechnikov 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
Maksim Pechnikov ff6c727739 Merge branch 'develop' into issue/1276
5 years ago
rinpatch fee1276963 Merge branch 'failing-search-fixes' into 'develop'
5 years ago
lain 4e53520917 User Search: Remove superfluous setweight and random test.
5 years ago
eugenijm ed29be24cb Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
Steven Fuchs 5271bbcf11 add missing tesla mocks
5 years ago
kaniini 06cc77e6fb Merge branch 'faster-user-deactivation' into 'develop'
5 years ago
lain 556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
5 years ago
lain 0c31258616 User: Don't pull remote users follower count immediately after deactivating.
5 years ago
rinpatch 8dd7c099a7 Merge branch 'bugfix/streamer-follows' into 'develop'
5 years ago
kaniini 74135e1318 Merge branch 'feature/omit-relay-user' into 'develop'
5 years ago
kaniini 61bcd4595f Merge branch 'feature/fast_sanitize' into 'develop'
5 years ago
Ariadne Conill 4bf942583f streamer: use direct object for filter checks when there is no valid child object in an activity
5 years ago
Maxim Filippov 1b83a0694a Fix moderation log crash
5 years ago
Maxim Filippov 743b622b7b Force password reset for multiple users
5 years ago
Maxim Filippov d75934b0d0 Undo dialyzer fix
5 years ago
Maxim Filippov ced9f92327 Fix count
5 years ago
Maxim Filippov 6f9d3d30fa AdminAPI: Omit relay user from users list
5 years ago
Maxim Filippov 59a149c69a Fix "the call ... will never return" warning
5 years ago
Mark Felder fcea6a9d2c Merge branch 'develop' into feature/fast_sanitize
5 years ago
Maksim Pechnikov 209319c8d2 update marker api
5 years ago
Egor Kislitsyn 61fc739ab8
Handle "Move" activity
5 years ago
kPherox 363e76d4da Fix duplicate recipients
5 years ago
rinpatch ae59b38203 Rip out the rest of htmlsanitizeex
5 years ago
Maksim Pechnikov b27a92e8fa Merge branch 'develop' into issue/1276
5 years ago
rinpatch 77cfb08b8c Remove commented-out code
5 years ago
kPherox 0c361eeb25
Add pending to handle incoming for Follow activity
5 years ago
rinpatch 08f6837065 Switch from HtmlSanitizeEx to FastSanitize
5 years ago
Egor Kislitsyn 4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
lain 2480200759 Merge branch 'refactor/following-relationships' into 'develop'
5 years ago
Maxim Filippov d56bc62275 Fix report parsing
5 years ago
Maxim Filippov 791bcfd90f Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
Maxim Filippov 8eff05d4c6 Strip status data from Flag (when federating or closing/resolving report)
5 years ago
eugenijm 0580654485 Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
5 years ago
rinpatch 653054d301 Merge branch 'remove-unsed-info-fields-fn' into 'develop'
5 years ago
Egor Kislitsyn b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
Egor Kislitsyn dbee53c2df
Remove unused Pleroma.User.info_fields/0
5 years ago
stwf 2ab072f949 object fetcher error handling
5 years ago
Maksim Pechnikov 922e3d082c add test
5 years ago
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maksim Pechnikov 99cf1ef9be Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov d3fb9e02cc add tests
5 years ago
Maxim Filippov b08b1d5d91 Store status data inside Flag activity
5 years ago
Maksim Pechnikov aa64b3108b fix migrate
5 years ago
Ivan Tashkinov c0246309a5 [#1304] Extra bullet-proofing.
5 years ago
Ivan Tashkinov 065e9fac12 [#1304] Adjusted User.Info references from Notification.
5 years ago
Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Ivan Tashkinov 11cd994425 [#1304] Fixed null::jsonb handling in User.Info migration.
5 years ago
lain 1adafa0966 Credo fixes.
5 years ago
lain 97d5c79aa0 Add Pipeline module, test for federation.
5 years ago
Maksim Pechnikov 9a4afbd2a0 added update unread_count for notifications
5 years ago
Ariadne Conill 3f6a596922 activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
Maksim Pechnikov d4270397dc Marker: added unread_count field
5 years ago
kaniini 6281e4795a Merge branch 'feature/push-subject-for-dm' into 'develop'
5 years ago
rinpatch 6712b6e4de Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
5 years ago
rinpatch 2dbee29cf5 Do not include notifications from blocked users when with_muted is set
5 years ago
Ivan Tashkinov 7c7f90bc4f [#1304] Merged `develop`, handled User.Info.invisible.
5 years ago
Maksim Pechnikov 243719a965 Merge branch 'develop' into feature/masto_api_markers
5 years ago
Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Egor Kislitsyn c6fba62666
Fix Relay
5 years ago
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
5 years ago
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Ivan Tashkinov b4cbf0568b [#1304] Analysis issue fix.
5 years ago
Ivan Tashkinov e8843974cb [#1304] Moved remaining fields from User.Info to User.
5 years ago
Ariadne Conill c9280b9730 rework to use properties instead of compound typing, per SocialCG
5 years ago
Ariadne Conill ef659331b0 implement invisible support for remote users
5 years ago
Ariadne Conill 95871cb462 user: implement User.invisible?/1
5 years ago
Ariadne Conill 1469a084d4 relay: set invisible to true
5 years ago
Ariadne Conill e7333db72a user info: add invisible field
5 years ago
Haelwenn f01dbc450c Merge branch 'feature/mastofe-pwa' into 'develop'
5 years ago
eugenijm 52ed2f8f2d Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
KokaKiwi 638457ba94 MastoFE: Add PWA manifest.
5 years ago
Mark Felder dcb23a85b6 Merge branch 'develop' into feature/push-subject-for-dm
5 years ago
Mark Felder 152caef51d Direct messages should provide a distinct push notification subject
5 years ago
Maxim Filippov 019147f115 Merge branch 'develop' into feature/relay-list
5 years ago
Ariadne Conill 44e64af5e7 object: containment: simplify the pattern match for OStatus testsuite hack
5 years ago
Ariadne Conill e99fdfc32d object: containment: only allow OStatus references in test suite environment
5 years ago
Ariadne Conill 3c785b85a6 object: fetcher: fix up formatting
5 years ago
Ariadne Conill bae96de273 activitypub: tag containment checks for better error tracing
5 years ago
Ariadne Conill 7295a05cee object: containment: also allow OStatus object IDs through when comparing origins
5 years ago
Ariadne Conill a177f22e02 object: fetcher: improve error reporting
5 years ago
Ariadne Conill bf2107743f object: containment: don't try to contain ostatus objects
5 years ago
Ariadne Conill 6f110fc04c object fetcher: fix up error handling
5 years ago
Ariadne Conill 48059c03c9 fix up some tests
5 years ago
Ariadne Conill d379b48769 kill almost all of the OStatus module
5 years ago
Ariadne Conill 6a1f4c5145 federator: remove OStatus incoming document support
5 years ago
Ariadne Conill 835ad52378 remove Salmon module
5 years ago
Ariadne Conill beb9861f9d router: disconnect Salmon
5 years ago
Ariadne Conill a7b92bba68 webfinger: stop pulling Salmon data out of WebFinger
5 years ago
Ariadne Conill c00ae10af8 feed: don't advertise salmon endpoint
5 years ago
Ariadne Conill adb639db56 publisher: move remote_users() from Salmon module
5 years ago
Ariadne Conill 4f82e42e4e websub: remove entirely
5 years ago
Ariadne Conill b16a460916 federator: remove websub stuff
5 years ago
Ariadne Conill 25b7ff56c3 application: don't start Federator.init/1 anymore
5 years ago
rinpatch 39e996528c Fix a migration wiping user info of users that don't have any mutes
5 years ago
Haelwenn (lanodan) Monnier 3c6fd0bb99
upload.ex: Remove deprecated configuration
5 years ago
Maxim Filippov 2473702be2 Merge branch 'develop' into feature/relay-list
5 years ago
kaniini 7511f3d192 Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
5 years ago
kaniini 733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
5 years ago
lain 203d61b950 Transmogrifier: Make proper use of the LikeValidator.
5 years ago
lain 66452f518f ObjectValidator: Rewrite LikeValidator with Ecto.
5 years ago
eugenijm 359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers
5 years ago
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
lain 081e8206ab Transmogrifier: Use new ingestion pipeline for Likes.
5 years ago
lain 6e4f52f8a2 Introduce new ingestion pipeline structure, implement internal Likes with it.
5 years ago
lain 1bfdf57fc7 Merge branch 'user-search-experiments' into 'develop'
5 years ago
feld 21f0757b0d Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
5 years ago
lain 6977cddff9 Merge branch 'benchmark-finishing' into 'develop'
5 years ago
rinpatch 0a5175ecbb Order fts results by trigram
5 years ago
rinpatch c10ce113d4 User search: Remove trigram and refactor the module
5 years ago
Maxim Filippov da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
Maxim Filippov 90d516d42b Store status data inside flag activity
5 years ago
Alexander e7bb762ec2
don't stream in benchmark env
5 years ago
kPherox 5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
5 years ago
Egor Kislitsyn 1d46944fbd
Do not add `follower_address` to `following` for non local users
5 years ago
eugenijm a97b642289 Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
lain e3b4a3e96b Merge branch 'incoming-id-fixes' into 'develop'
5 years ago
rinpatch 9bdbf0811b Make MediaProxy failure tracking less brutal
5 years ago
Maxim Filippov cc6875b582 Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
Maxim Filippov c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
lain 422aa6befe Ostatus DeleteHandler: Fix for new option format.
5 years ago
lain 37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
lain 9b963064eb Transmogrifier: Actually store who deleted a note.
5 years ago
Maxim Filippov f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
Egor Kislitsyn 059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
lain 29647dfd09 Transmogrifier: Save correct ids for incoming deletes.
5 years ago
lain c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
lain d7f9679ff2 Merge branch 'develop' into 'reactions'
5 years ago
Maxim Filippov 24eecc3cb4 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov ad42837244 Ability to toggle activation status and permission group for a group of users
5 years ago
eugenijm 580a67f5ca Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Maxim Filippov aa7fd616c7 Line is too long!
5 years ago
Maxim Filippov 35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov 7aceaa517b Admin API: Reports, grouped by status
5 years ago
lain 6c278cfe09 Merge branch 'develop' into 'reactions'
5 years ago
Ariadne Conill 9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287)
5 years ago
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus
5 years ago
lain d580eedfe9 Linting.
5 years ago
lain 73b6512907 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini 93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop'
5 years ago
Ivan Tashkinov 28fb98d69e Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
lain 91e90aa807 Merge branch 'misskey-compat' into 'reactions'
5 years ago
Haelwenn b4f3c16885 Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
kaniini 2411d09215 Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
5 years ago
feld 1d8e956c32 Use the user.id instead of nickname in report URLs
5 years ago
Ivan Tashkinov b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
rinpatch fefbd31c6e Move local keys out of `user.info`
5 years ago
Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
lain 61097ba6ab Merge branch 'develop' into 'reactions'
5 years ago
Ivan Tashkinov f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Haelwenn 9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
5 years ago
kaniini 7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop'
5 years ago
kaniini 45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop'
5 years ago
kaniini 17ff4b43cb Merge branch 'unread-conversation-count' into 'develop'
5 years ago
eugenijm 8249924485 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain 1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain 276a520163 CommonAPI: Create profile updates as public.
5 years ago
lain 4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id.
5 years ago
Thibaut Girka 791d93ff0e Make credo happy
5 years ago
Thibaut Girka 977e711e22 Import object from self-Announce whenever possible
5 years ago
kaniini e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
5 years ago
lain 6a85f7d1ea Transmogrifier: Extend misskey like compatibility.
5 years ago
lain d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maksim Pechnikov 83631752af removed legacy api: "/objects/:uuid/likes"
5 years ago
kaniini e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
5 years ago
kaniini 5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop'
5 years ago
Maxim Filippov 8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once
5 years ago
Ariadne Conill d1d058bf85 streamer: worker: actually use should_send? consistently
5 years ago
Ariadne Conill 5a0c018d2a streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
5 years ago
Ariadne Conill 2417b633ed streamer: add missing copyright headers
5 years ago
lain 43a211bcb1 Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
5 years ago
lain 568a995d64 ActivityPub: Change addressing of Undo.
5 years ago
lain 27110793a7 Merge branch 'featrue/job-monitor' into 'develop'
5 years ago
lain 27e914955e Merge branch 'fix/nickname-fail' into 'develop'
5 years ago
rinpatch 8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by
5 years ago
lain 01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop'
5 years ago
Egor Kislitsyn d3ac4e8083
Fix OAuthController
5 years ago
Haelwenn (lanodan) Monnier 5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
5 years ago
eugenijm 06d9df79c5 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain c9043c6c80 Transmogrifier: Handle incoming Undos for EmojiReactions.
5 years ago
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
lain 4cb603e1df PleromaAPI: Add unreacting.
5 years ago
lain 391c736292 PleromaAPI: Fix emoji_reactions_by
5 years ago
Egor Kislitsyn e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
Egor Kislitsyn 7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
lain 9cfe9a57c5 CommonAPI: Add unreactions.
5 years ago
Egor Kislitsyn d3c404af12
Add MastoFEController
5 years ago
lain dfe5c958eb ActivityPub: Add undo for emoji reactions.
5 years ago
Egor Kislitsyn 1c6e1055c8
Add CustomEmojiController
5 years ago
lain 557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini 433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop'
5 years ago
kaniini debd0a3066 Merge branch 'accept-embedded-announce-object' into 'develop'
5 years ago
Thibaut Girka 86880b9821 Inline object when Announcing a self-owned private object
5 years ago
Thibaut Girka 3d61efa7c9 Rename misleading `get_announce_visibility` to `public_announce?`
5 years ago
Egor Kislitsyn 26693292f4
Remove `:enqueued` counter
5 years ago
Egor Kislitsyn c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini 89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
5 years ago
kaniini 8557176808 Merge branch 'split-masto-api/auth' into 'develop'
5 years ago
kaniini 9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop'
5 years ago
feld 1255ec888d Revert "Add upload limits to /api/v1/instance"
5 years ago
Thibaut Girka 427d0c2a00 Store private announcements in object.data["announcements"], filter them on display
5 years ago
Sergey Suprunenko c541b83bef Track failed proxy urls and don't request them again
5 years ago
Thibaut Girka 43e3db0951 Fix returned visibility of announces in MastodonAPI
5 years ago
Thibaut Girka 4c1f158f5d Allow users to announce privately, including own private notes
5 years ago
Maxim Filippov b2273c695e Discard identifier, if empty
5 years ago
Thibaut Girka fe538973dd Ensure self-announces do not widen the audience of the original post
5 years ago
KokaKiwi 1f0be71ea4 Make activity announceable by its author.
5 years ago
Maxim Filippov 0f9c2c8b87 Send an identifier alongside with error message in OAuthController
5 years ago
Egor Kislitsyn af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
Egor Kislitsyn 2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
Egor Kislitsyn 39695c4436 Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
Egor Kislitsyn 585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
Egor Kislitsyn 36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
kPherox a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
lain dae744478e Transmogrifier: Handle compact objects in undos.
5 years ago
Ivan Tashkinov 6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
lain 19bc0b8c79 .
5 years ago
lain 08256e9299 ActivityPub: Federate reactions.
5 years ago
lain 6068d2254e PleromaAPIController: Fixes and refactoring.
5 years ago
lain 04a2910f33 Pleroma.Constants: Fix typo.
5 years ago
Egor Kislitsyn 0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
Egor Kislitsyn 987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn 3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
Egor Kislitsyn e7aef27c00
Fix merge
5 years ago
lain a7f22c6e93 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain b923842e96 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini 26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop'
5 years ago
kaniini 0e356cc800 Merge branch 'split-masto-api/reports' into 'develop'
5 years ago
kaniini 74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop'
5 years ago
Egor Kislitsyn b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
5 years ago
Ariadne Conill 1d7cbdaf7b change new scrobble endpoint
5 years ago
Ariadne Conill e653edd182 split scrobble functions into their own controller
5 years ago
Ariadne Conill a6e1469767 router: change scrobble timeline route from now-playing to scrobbles
5 years ago
Ariadne Conill 8b34b221cb common api: add some missing IR bits for listen activities' children
5 years ago
Ariadne Conill 84712c35f9 activitypub: object view: include child object for Listen activities
5 years ago
Ariadne Conill 71eff09e56 common api: make sure the generated IR is actually federatable
5 years ago
Ariadne Conill 7cad6ea67a pleroma api: hook up scrobbler controller
5 years ago
Ariadne Conill 2c82d8603b common api: implement scrobbling
5 years ago
Ariadne Conill 172c74a77b activitypub: transmogrifier: implement support for Listen activities
5 years ago
Ariadne Conill 1f9de2a8cd activitypub: implement IR-level considerations for Listen activities
5 years ago
Ariadne Conill b7877e9b1c mastodon api: implement rendering of listen activities
5 years ago
Egor Kislitsyn d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
rinpatch e9d1aa75d5 Revert subscription refactoring.
5 years ago
kaniini 6d74a7528c Merge branch 'feature/follow-requests-count' into 'develop'
5 years ago
Maksim Pechnikov 1053319cd6 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Haelwenn (lanodan) Monnier 9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
rinpatch 374f83d29b Fix not being able to post empty statuses with attachments
5 years ago
minibikini f9380289eb Add `remote_ip` plug
5 years ago
kaniini 92d08d4113 Merge branch 'split-masto-api/follow-requests' into 'develop'
5 years ago
kaniini 68bf99baf2 Merge branch 'split-masto-api/domain-blocks' into 'develop'
5 years ago
kaniini 27a3221d57 Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
5 years ago
Egor Kislitsyn 408750b94e Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
Egor Kislitsyn 99c5a35890 Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
Egor Kislitsyn 8d31530119 Cleanup ScheduledActivityView
5 years ago
Egor Kislitsyn 0a5b106ddd Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
Egor Kislitsyn 621377f378 Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
Egor Kislitsyn 6c7c35dbe1 Fix SubscriptionNotificationView
5 years ago
kaniini 91e2bcf218 Merge branch 'refactor/status-controller' into 'develop'
5 years ago
Ariadne Conill 14294243a2 mastodon api: implement follow_requests_count
5 years ago
Egor Kislitsyn 5ea5c58a85 Move view logic from StatusController.context to StatusView and add a test
5 years ago
kaniini eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop'
5 years ago
Egor Kislitsyn 98d1347a4e Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
kaniini 219771288c Merge branch 'refactor/common_api' into 'develop'
5 years ago
kaniini dc0fdb5e84 Merge branch 'refactor/timeline-controller' into 'develop'
5 years ago
Maksim Pechnikov 73ae38ca04 add deprecated tag
5 years ago
Maksim Pechnikov b4fc96f640 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maxim Filippov e7836adf21 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maksim Pechnikov 3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Egor Kislitsyn 75290cbfbd Add Pleroma.JobQueueMonitor
5 years ago
Roman Chvanikov b4b147000c Merge develop
5 years ago
Egor Kislitsyn 3572cf29b7 Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
Egor Kislitsyn c57ad0a402 Cleanup CommonAPI
5 years ago
Egor Kislitsyn de3e90e536 Add ActivityDraft.with_valid/2
5 years ago
Egor Kislitsyn eed774d058 Add CommonAPI.ActivityDraft
5 years ago
kaniini 6abe12dced Merge branch 'refactor/notification-controller' into 'develop'
5 years ago
kaniini a39e065916 Merge branch 'feature/return-link-for-password-reset' into 'develop'
5 years ago
kaniini 48a82c4609 Merge branch 'refactor/user' into 'develop'
5 years ago
Hakaba Hitoyo 5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context"
5 years ago
kaniini 3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop'
5 years ago
kaniini beabc49e35 Merge branch 'feature/activities-pagination-by-offset' into 'develop'
5 years ago
kaniini 1b9cd4c866 Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
5 years ago
rinpatch f92d7d52c2 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
rinpatch f2880d7d29 Credo considered harmful
5 years ago
rinpatch c7d8ccd0c4 Remove useless with clause
5 years ago
rinpatch 1ddd403339 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch d87be2ec96 Don't embed the first page in inboxes/outboxes and refactor the views to
5 years ago
Ekaterina Vaartis 1fd9c60f87 Fix emoji tags for shareable packs to be "pack:{name}"
5 years ago
Ekaterina Vaartis 118d6dcdf4 Fix nodeinfo handling
5 years ago
Ekaterina Vaartis ba9d35a904 Add an API endpoint for listing remote packs
5 years ago
vaartis a6e85215e1 Credo fix (remove parens on function definition)
5 years ago
vaartis f21dbbc021 Move emoji_dir_path & cache_seconds_per_file
5 years ago
Ekaterina Vaartis cdbe7cd37a When listing emoji packs, be sure to create the directory
5 years ago
Egor Kislitsyn b5dfe83433 Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
Maksim Pechnikov 1a858134ed Merge branch 'develop' into issue/1218
5 years ago
Maxim Filippov 60cbea5bb2 Allow activities pagination via limit/offset
5 years ago
Haelwenn (lanodan) Monnier 0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
5 years ago
Egor Kislitsyn 035f22f784 Fix Credo warnings
5 years ago
Egor Kislitsyn 1bea67cb5e Cleanup Pleroma.User
5 years ago
Egor Kislitsyn 209395c7e6 Add User.change_info/2 and User.update_info/2
5 years ago
Maxim Filippov 5e9759cd7d Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Egor Kislitsyn a66a7a328f Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
Egor Kislitsyn 79b25be4e1 Do not return tuple when unneeded
5 years ago
Maksim Pechnikov d75d0ae134 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
kaniini 29dd8ab9c0 Merge branch 'feature/force-password-reset' into 'develop'
5 years ago
kaniini 19263f30c3 Merge branch 'support-rel-ugc' into 'develop'
5 years ago
kaniini 760df67a7b Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
5 years ago
kaniini ad9595ca55 Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
5 years ago
Steven Fuchs e1d2d69c87 Clean up views
5 years ago
Ekaterina Vaartis e63f167f01 Also pretty print pack.json
5 years ago
Rachel Fae Fox 63af6951fa add tunable for stream uploads, as needed for jortage to work.
5 years ago
Maksim Pechnikov 494bb6bac6 updated tests
5 years ago
Maksim Pechnikov 179fa32dd5 Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maksim Pechnikov 38245f1336 Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch fd48bd80eb Merge branch 'better-emoji-packs' into 'develop'
5 years ago
rinpatch 6b3d5ed6db Emoji API Controller: Follow phoenix directory structure
5 years ago
Haelwenn (lanodan) Monnier 815b904508
Add support for AP C2S uploadMedia
5 years ago
Haelwenn (lanodan) Monnier 2ad50583f0
Document and test /api/ap/whoami
5 years ago
Maxim Filippov d72d4757a8 Format
5 years ago
Maxim Filippov 02bbcd6180 Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Maxim Filippov 72a01f1350 Use router helper to generate reset password link
5 years ago
Maxim Filippov 6f25668215 Admin API: Add ability to force user's password reset
5 years ago
eugenijm 7cf1252455 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
lain b80c41a14f Merge branch 'outbox_pagination' into 'develop'
5 years ago
D Anzorge 0e6085da10 Fix pagination in AP outbox.json
5 years ago
Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Egor Kislitsyn 95c948110c Add `rel="ugc"` to hashtags and mentions
5 years ago
Egor Kislitsyn cf3041220a Add support for `rel="ugc"`
5 years ago
eugenijm fe5e0b7846 Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
Maksim Pechnikov d4ed3a35b8 Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
Haelwenn f95a2b2cda Merge branch 'issue/733' into 'develop'
5 years ago
rinpatch b0ec82d24a Merge branch 'chores/bump-copyright-year' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 447514dfa2
Bump copyright years of files changed in 2019
5 years ago
Ekaterina Vaartis b585134c90 Get the nodeinfo address from the well-known
5 years ago
Ekaterina Vaartis a1325d5fd9 Change path from nodeinfo to metadata->features
5 years ago
Ekaterina Vaartis d51e5e447e Move emoji reloading to admin api
5 years ago
Ekaterina Vaartis 7680aec17d Move emoji api to pleroma api dir
5 years ago
Ekaterina Vaartis 36f2275dc9 A feature for shareable emoji packs, use it in download_from & tests
5 years ago
Ekaterina Vaartis 74fb6d8647 Move EmojiAPIController from EmojiAPI to PleromaAPI
5 years ago
Ekaterina Vaartis 6cd651a38b Make the emoji controller api more RESTy
5 years ago
Ekaterina Vaartis 3971bf9c5f Change :sha to :checksum
5 years ago
Ekaterina Vaartis 7c784128fd Change emoji api responses to JSON
5 years ago
Ekaterina Vaartis f24731788e Move emoji pack list from /list to /
5 years ago
vaartis cb125ffaf7 Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
Ekaterina Vaartis 8f509e6d1e Use with w/ pack_info_res
5 years ago
Ekaterina Vaartis 8790365fef Remove unused variable
5 years ago
vaartis b8a214b0ab Split list_packs
5 years ago
vaartis f251225cae Apply suggestions to emoji_api_controller.ex
5 years ago
vaartis c049c32270 Fixed a typo in create_archive_and_cache
5 years ago
vaartis 163082de6f Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
Ekaterina Vaartis f6d4acc871 Fix credo warnings
5 years ago
Ekaterina Vaartis 87057101b0 Add documentation for the emoji api endpoints
5 years ago
Ekaterina Vaartis 9eb2ee4df0 Allow importing old (emoji.txt / plain) packs from the filesystem
5 years ago
Ekaterina Vaartis 13cd93a0d3 Use && insted of "and" for checking shared-files for packs
5 years ago
Ekaterina Vaartis f5131540dc Add a way to create emoji packs via an endpoint
5 years ago
Ekaterina Vaartis 8dbdd5c280 Allow uploading new emojis to packs from URLs
5 years ago
Ekaterina Vaartis 16edfef12e Handle empty shortcode/filename/new_shortcode/new_filename
5 years ago
Ekaterina Vaartis 9afe7258dd Implememt emoji pack file updating + write tests
5 years ago
Ekaterina Vaartis 261d92f9c2 Update the pack fallback-src sha generation condition
5 years ago
Ekaterina Vaartis bcc0bfd0c5 Add an endpoint for emoji pack metadata updating
5 years ago
Ekaterina Vaartis b78973d27f fallback can't have pack.json, reflect that in code
5 years ago
Ekaterina Vaartis 2a94eca096 Change YAML to JSON
5 years ago
Ekaterina Vaartis b0ecd412f5 Clean out old emojis on reload
5 years ago
Ekaterina Vaartis 2d4b8f3d20 Add an endpoint for deleting emoji packs
5 years ago
Ekaterina Vaartis 3a8669b487 Fix responses for emoji pack controlller
5 years ago
Ekaterina Vaartis 7a0c755d0a Send ok for emoji reloading as text, not as json
5 years ago
Ekaterina Vaartis ee620ecbf1 Add caching for emoji pack sharing
5 years ago
Ekaterina Vaartis 7fb7dd9e0e Only find SHA256 for packs that are shared
5 years ago
Ekaterina Vaartis 54b8e683bc Swap TOML for YAML to get YAML generation for packs from fallbacks
5 years ago
Ekaterina Vaartis b791a08656 Implement API actions on packs
5 years ago
Ekaterina Vaartis 6a42641b8d Add pack.toml loading
5 years ago
feld ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop'
5 years ago
feld 25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop'
5 years ago
Haelwenn e32d099a3a Merge branch 'feature/poll-refresh' into 'develop'
5 years ago
rinpatch 5028b7b578 Fix credo issues
5 years ago
rinpatch c096dd86e5 Do not refetch local objects
5 years ago
rinpatch eb87a86b5b Preserve internal fields when reinjecting
5 years ago
rinpatch d32894ae51 Move object internal fields to a constant
5 years ago
rinpatch e3f902b3a1 Set updated_at even if the object stayed the same
5 years ago
rinpatch a9c700ff15 Fix wrong argument order when calling NaiveDateTime.diff
5 years ago
rinpatch 7ef575d11e Initial poll refresh support
5 years ago
Maxim Filippov 384b7dd40d Fix response
5 years ago
Maxim Filippov f89728ad95 Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Ivan Tashkinov e4f3d7f69d Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
5 years ago
Ivan Tashkinov 551f2fa59e [#1234] Added changelog entry, removed admin OAuth scopes.
5 years ago
Ivan Tashkinov c98e761d28 Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Alex S a18f1e7cd7 namings
5 years ago
Alex S 2263c8b6b9 little fixes
5 years ago
Alex S 4faf2b1555 post for creating invite tokens in admin api
5 years ago
Haelwenn (lanodan) Monnier e501c822c9
markdown.ex: put two-spaces before the description-newline
5 years ago
Haelwenn (lanodan) Monnier 4785596a2c
markdown.ex: end suggestions list with a newline
5 years ago
Haelwenn (lanodan) Monnier d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
5 years ago
Haelwenn (lanodan) Monnier d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
5 years ago
Haelwenn (lanodan) Monnier c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
Haelwenn (lanodan) Monnier 106afaed58
markdown.ex: do not fail if there is no children
5 years ago
Haelwenn (lanodan) Monnier e0d8c8897e
docs/markdown.ex: do no print empty suggestions
5 years ago
Ivan Tashkinov b4d775161c [#1234] Undone reordering-related changes in router.ex.
5 years ago
Maxim Filippov f9dd121ad3 Admin API: Return link alongside with token on password reset
5 years ago
Ivan Tashkinov 01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Haelwenn (lanodan) Monnier 7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
5 years ago
Maksim Pechnikov 0447c42715 Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov 76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
rinpatch ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop'
5 years ago
Maksim Pechnikov 7dd51652f9 Merge branch 'develop' into issue/733
5 years ago
Steven Fuchs 6193157f19 Fix notification warnings
5 years ago
Haelwenn 2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
5 years ago
rinpatch 95a4a19417 Merge branch 'support/tests' into 'develop'
5 years ago