Commit Graph

5879 Commits (68a126317d7cdd670c8e244319da08ff85639d33)

Author SHA1 Message Date
Alexander Strizhakov 6cda360fea
don't restart postgrex
4 years ago
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
4 years ago
Haelwenn d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop'
4 years ago
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
4 years ago
Alexander Strizhakov 304ea09f4c
fix for logger configuration
4 years ago
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
4 years ago
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
4 years ago
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data
4 years ago
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities
4 years ago
rinpatch 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
4 years ago
rinpatch 77ee64b993 user: remove blank?
4 years ago
Alexander Strizhakov 72ef6cc4f2
added need_reboot endpoint to admin api
4 years ago
Egor Kislitsyn cf4ebba774
Cleanup SubscriptionController
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
Haelwenn b1c1d2e5e1 Merge branch 'fix/1659-rate-limiter' into 'develop'
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
Alexander Strizhakov 22bde21c4f
remote_ip plug adds remote_ip_found flag
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
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
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 7ee35eb9a6 Merge branch 'fix/mix-tasks-failing-otp' into 'develop'
5 years ago
rinpatch 2ba754ffe1 Fix mix tasks failing on OTP releases
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 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
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
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
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
Egor Kislitsyn 03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
5 years ago
lain 1d4ab06505 Merge branch 'featureflag/emoji_reactions' into 'develop'
5 years ago
lain 96ee0aadbf Merge branch 'improving-test-coverage' 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
Alexander Strizhakov b59ac37b2c
tests for emoji mix task
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
Haelwenn (lanodan) Monnier b30fb1f3bb
User: Fix use of source_data in profile_url/1
5 years ago
kPherox 7408f003a6
Use `Pleroma.Formatter.linkify` instead of `AutoLinker.link`
5 years ago
lain c982093cc2 Transmogrifier: Fix BAD code by RINPATCH
5 years ago
lain 1b323ce1c6 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain ecac57732a Transmogrifier: Only add context if it really is onne.
5 years ago
lain 51fc504705 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain 288f2b5a7c Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain 0be1fa0a86 Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
lain 057438a657 CommonAPI: DRY up a bit.
5 years ago
lain 643f15e77b Validators: ObjectID is an http uri.
5 years ago
kPherox d191b0942f
Remove no longer used function
5 years ago
lain f6835333be Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
5 years ago
Ivan Tashkinov ea9c57b26e [#2332] Misc. improvements per code change requests.
5 years ago
Ivan Tashkinov 9c94b6a327 [#2332] Misc. fixes per code change requests.
5 years ago
lain 8bd5ad8664 Merge branch 'benchmark-improvements' into 'develop'
5 years ago
Alexander Strizhakov b607ae1a1c
removing grouped reports admin api endpoint
5 years ago
Alexander Strizhakov 1fcdcb12a7
updating gun with bug fix
5 years ago
Alexander Strizhakov f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 1f29ecdcd7
sync with develop
5 years ago
Alexander Strizhakov eb9744cade
activities generation tasks
5 years ago
Haelwenn e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop'
5 years ago
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov be9d18461a FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov dfbc05d496 Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
Ivan Tashkinov 6b793d3f83 Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
5 years ago
lain 29ab1d9f8d Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain 69fc1dd69f Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain 0c60c0a76a Validators: Use correct type for IDs.
5 years ago
lain 0adaab8e75 Bump copyright dates.
5 years ago
lain eaacc64839 Refactors.
5 years ago
lain ee979dd6d7 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
lain d7aa0b645b Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
5 years ago
lain 4cf1007a7d ActivityPub: Small refactor.
5 years ago
Ivan Tashkinov 112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
rinpatch af820f8cf1 Merge branch 'benchmark_timeline' into 'develop'
5 years ago
Ivan Tashkinov 460e41585c Further preloading (more endpoints), refactoring, tests.
5 years ago
Ivan Tashkinov be5e2c4dbb Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
5 years ago
Ivan Tashkinov 3fa3d45dbe [#1364] Minor improvements / comments.
5 years ago
Ivan Tashkinov 012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Ivan Tashkinov e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships".
5 years ago
Haelwenn (lanodan) Monnier 212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
5 years ago
Ivan Tashkinov 8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov 13cbb9f6ad Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
feld 8eebc75c15 Merge branch 'fix/activity-deletion' into 'develop'
5 years ago
rinpatch f316882464 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
lain aaf00f1ff5 Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
lain 74560e888e Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
5 years ago
lain 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop'
5 years ago
Egor Kislitsyn 4a2538967c
Support pagination in conversations
5 years ago
Egor Kislitsyn d1a9716a98
Fix activity deletion
5 years ago
rinpatch fbf02a3722 Merge branch 'bugfix/profile-bio-newline' into 'develop'
5 years ago
lain 3bd2829e5c Benchmarks: Add timeline benchmark
5 years ago
Ivan Tashkinov 86f2fbc81e Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Egor Kislitsyn 5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
Ivan Tashkinov 3c78e5f327 Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
5 years ago
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Ivan Tashkinov c2e415143b WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
5 years ago
Haelwenn (lanodan) Monnier 15be6ba9c2
AccountView: fix for other forms of <br> in bio
5 years ago
rinpatch 981e015f1b Mastodon API Account view: Remove an outdated hack
5 years ago
Alexander Strizhakov 9bae9b1b1b
Merge branch 'develop' into gun
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
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 89e4b3ebbd
fix for content-type header for tag feed
5 years ago
Alexander Strizhakov 91870c8995
adding rss for user feed
5 years ago
Alexander Strizhakov 26e2076659
fix for feed page pagination
5 years ago
Haelwenn (lanodan) Monnier 8176ca9e40 static_fe: Sanitize HTML in users
5 years ago
Haelwenn (lanodan) Monnier 0ac6e29654 static_fe: Sanitize HTML in posts
5 years ago
lain fa4ec17c84 Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
5 years ago
Ivan Tashkinov 7c8003c3fc [#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
5 years ago
Haelwenn d84670b9e1 Merge branch 'f' into 'develop'
5 years ago
Haelwenn 67a27825b1 Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
5 years ago
rinpatch e87a32bcd7 rip out fetch_initial_posts
5 years ago
Haelwenn (lanodan) Monnier 8f7bc07ebc pleroma_api_controller.ex: Improve conversations error reporting
5 years ago
Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
rinpatch d88c8a9614 Merge branch 'fix/cache-control-headers' into 'develop'
5 years ago
rinpatch 6a28c198af uploaded media plug: do not inject compile-time params on every request
5 years ago
rinpatch 38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop'
5 years ago
rinpatch 994ac4357c Merge branch 'fix/hashtags-streaming' into 'develop'
5 years ago
rinpatch 658f30c0b3 Merge branch 'static-accept-missing' into 'develop'
5 years ago
rinpatch fc4496d4fa rate limiter: disable based on if remote ip was found, not on if the plug was enabled
5 years ago
rinpatch 3e0f05f08e Merge branch 'bugfix/br-vs-newline' into 'develop'
5 years ago
Mark Felder c6eb1c1b92 Merge branch 'develop' into fix/cache-control-headers
5 years ago
Mark Felder 7321429a2e Lint
5 years ago
Mark Felder 3b1b183b42 Synchronize cache-control header for local media with the mediaproxy
5 years ago
Mark Felder 413177c8f0 Set correct Cache-Control header for local media
5 years ago
Mark Felder c62195127d Update comment to reflect what the code is actually doing
5 years ago
Mark Felder ad31d0726a Do not trust remote Cache-Control headers for mediaproxy
5 years ago
rinpatch 096c5c52e0 Merge branch 'revert/cache-control' into 'develop'
5 years ago
Egor Kislitsyn fffc382f13
Fix hashtags WebSocket streaming
5 years ago
Haelwenn (lanodan) Monnier d1379c4de8
Formatting: Do not use \n and prefer <br> instead
5 years ago
Alexander Strizhakov 98ed0d1c4b
more clean up
5 years ago
feld 802b991814 Merge branch 'exclude-posts-visible-to-admin' into 'develop'
5 years ago
Alexander Strizhakov 39ed608b13
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov 1306b92997
clean up
5 years ago
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