Commit Graph

4633 Commits (d6693a91028ab3ee7865f530f3ad2532542fc2d2)

Author SHA1 Message Date
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 5b39526198 AccountController: Use code 400 for self-follow.
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
Egor Kislitsyn 11433cd38d
Add OpenAPI schema for FlakeID
4 years ago
Egor Kislitsyn f0238d010a
Improve OpenAPI schema
4 years ago
Ivan Tashkinov f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain 3c828016d9 Merge branch 'openapi/custom-emojis' into 'develop'
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
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
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
rinpatch e0d7847bc5 Merge branch 'sideeffects-test' into 'develop'
4 years ago
lain 26d9c83316 SideEffects: Test for notification creation.
4 years ago
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
4 years ago
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
4 years ago
Haelwenn (lanodan) Monnier 46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
4 years ago
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
4 years ago
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
4 years ago
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
4 years ago
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
4 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
4 years ago
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities
4 years ago
rinpatch 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
4 years ago
Alexander Strizhakov 72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
Egor Kislitsyn cf4ebba774
Cleanup SubscriptionController
4 years ago
Maksim Pechnikov 4b3b1fec4e added an endpoint for getting unread notification count
4 years ago
Ivan Tashkinov bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
4 years ago
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
4 years ago
Egor Kislitsyn 65f04b7806
Fix credo warning
4 years ago
Egor Kislitsyn 16f4787bf7
Add a TODO note
4 years ago
Egor Kislitsyn 0e647ff55a
Abstract pagination params in OpenAPI spec
4 years ago
Egor Kislitsyn 8ed162b655 Fix formatting
4 years ago
minibikini 5a2e45a218 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
4 years ago
minibikini 81a4c15816 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
4 years ago
minibikini a45bd91d4e Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
4 years ago
minibikini bfa26b0937 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
4 years ago
minibikini a794ba655f Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
4 years ago
minibikini a7feca1604 Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
4 years ago
minibikini d3e876aeee Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex
4 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
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
Haelwenn 60cc7d6c9a Merge branch 'issue/1276' into 'develop'
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 a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
Maksim Pechnikov c5c09fc61b fix mediaType of object
5 years ago
Alex Gleason 9a3c74b244
Always accept deletions through SimplePolicy
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
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 b6bed1a284
Types.URI: New
5 years ago
Haelwenn (lanodan) Monnier 19eedb3d04
User: Move public_key from source_data to own field
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 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
Haelwenn (lanodan) Monnier c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
5 years ago
Ivan Tashkinov 1a4875adfa [#1559] Support for "follow_request" notifications (configurable).
5 years ago
Maksim Pechnikov 2b7d7bbd2d Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn 03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
5 years ago
lain 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop'
5 years ago
lain 349b9d86dc Merge branch 'remake-remodel-2' into 'develop'
5 years ago
lain 772bc258cd ObjectID Validator: Refactor.
5 years ago
lain e67cde0ed6 Transmogrifier: Refactoring / Renaming.
5 years ago
Ivan Tashkinov fc81e5a49c Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Ivan Tashkinov 3fa51f7272 Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
5 years ago
Ivan Tashkinov aa78325117 [#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Egor Kislitsyn 0aa24a150b
Add oAuth
5 years ago
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
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
lain f6835333be Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
Ivan Tashkinov 9c94b6a327 [#2332] Misc. fixes per code change requests.
5 years ago
Alexander Strizhakov b607ae1a1c
removing grouped reports admin api endpoint
5 years ago
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Haelwenn e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop'
5 years ago
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov be9d18461a FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov dfbc05d496 Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
Ivan Tashkinov 6b793d3f83 Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
5 years ago
lain 29ab1d9f8d Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain 69fc1dd69f Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain 0c60c0a76a Validators: Use correct type for IDs.
5 years ago
lain 0adaab8e75 Bump copyright dates.
5 years ago
lain eaacc64839 Refactors.
5 years ago
lain ee979dd6d7 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain d7aa0b645b Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
5 years ago
lain 4cf1007a7d ActivityPub: Small refactor.
5 years ago
Ivan Tashkinov 112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
rinpatch af820f8cf1 Merge branch 'benchmark_timeline' into 'develop'
5 years ago
Ivan Tashkinov 460e41585c Further preloading (more endpoints), refactoring, tests.
5 years ago
Ivan Tashkinov be5e2c4dbb Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
5 years ago
Ivan Tashkinov 012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Ivan Tashkinov e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships".
5 years ago
Haelwenn (lanodan) Monnier 212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
5 years ago
Ivan Tashkinov 8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov 13cbb9f6ad Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
feld 8eebc75c15 Merge branch 'fix/activity-deletion' into 'develop'
5 years ago
rinpatch f316882464 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
lain aaf00f1ff5 Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain 74560e888e Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
5 years ago
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop'
5 years ago
Egor Kislitsyn 4a2538967c
Support pagination in conversations
5 years ago
Egor Kislitsyn d1a9716a98
Fix activity deletion
5 years ago
rinpatch fbf02a3722 Merge branch 'bugfix/profile-bio-newline' into 'develop'
5 years ago
lain 3bd2829e5c Benchmarks: Add timeline benchmark
5 years ago
Ivan Tashkinov 86f2fbc81e Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Egor Kislitsyn 5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
Ivan Tashkinov 3c78e5f327 Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
5 years ago
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Ivan Tashkinov c2e415143b WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
5 years ago
Haelwenn (lanodan) Monnier 15be6ba9c2
AccountView: fix for other forms of <br> in bio
5 years ago
rinpatch 981e015f1b Mastodon API Account view: Remove an outdated hack
5 years ago
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
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 f0651730bd
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 89e4b3ebbd
fix for content-type header for tag feed
5 years ago
Alexander Strizhakov 91870c8995
adding rss for user feed
5 years ago
Alexander Strizhakov 26e2076659
fix for feed page pagination
5 years ago
Haelwenn (lanodan) Monnier 8176ca9e40 static_fe: Sanitize HTML in users
5 years ago
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
5 years ago
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
5 years ago
Ivan Tashkinov 7c8003c3fc [#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
5 years ago
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
5 years ago
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 38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop'
5 years ago
rinpatch 3e0f05f08e Merge branch 'bugfix/br-vs-newline' into 'develop'
5 years ago
rinpatch 096c5c52e0 Merge branch 'revert/cache-control' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead
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
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 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
Ivan Tashkinov 5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
Maksim Pechnikov edb659dc57 Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov b2eb1124d1
Merge branch 'develop' into gun
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
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
lain 6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop'
5 years ago
Alexander Strizhakov 22d52f5691
same copyright date format
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 509c81e4b1
Merge branch 'develop' into gun
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 34f1d09f3a
spec fix
5 years ago
Alexander Strizhakov 32d1e04817
ActivityPub actions & side-effects in transaction
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
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
feld f2216287a7 Merge branch 'admin-status-list' into 'develop'
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
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 13918cb545
Merge branch 'develop' into gun
5 years ago
Haelwenn c5570e0493 Merge branch 'single_emoji_reaction' 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
lain 314928333a Pleroma API: Add endpoint to get reaction information on a single emoji
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
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
Maksim Pechnikov da44ee5b0f Merge branch 'develop' into issue/1276
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
Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383
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
Lain Soykaf 8a79f20c21 EmojiReactions: Rename to EmojiReacts
5 years ago
feld df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop'
5 years ago
Alexander Strizhakov c85aa6e87f
removing confusing error
5 years ago
rinpatch 15cb1f6804 Merge branch 'fix/unpinnable-polls' into 'develop'
5 years ago
Alexander Strizhakov 5db6ac8ee4
removing migrate_from_db endpoint from admin api
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
lain a0d9d42eaa Emoji Reactions: Actually use the validation.
5 years ago
feld e2f2602fdc Merge branch 'emoji-api-errors' into 'develop'
5 years ago
feld b3e9c87724 Update emoji_api_controller.ex
5 years ago
rinpatch 263abe3ba5 Merge branch 'emoji-reactions-reacted' into 'develop'
5 years ago
Haelwenn 946de2299c Merge branch 'fix-streaming-reblog' into 'develop'
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 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
lain 77f24525ca Streamer: Correctly handle reblog mutes
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
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
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 0fceeb44b3 Merge branch 'emoji-reaction-sanity-check' into 'develop'
5 years ago
lain 347f3ed2c6 Emoji reactions: Change api format once more
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
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 df0b8f1d08
Add new users digest email
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
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
Haelwenn (lanodan) Monnier 6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
5 years ago
Alexander Strizhakov e699861690
full update for some subkeys
5 years ago
Alexander Strizhakov 89e93fb33f
return db key on update requests
5 years ago
Maksim Pechnikov 108a39c876 updated error messages for authentication process
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
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
feld bb5862ea2f Merge branch 'issue/1354' into 'develop'
5 years ago