Commit Graph

5552 Commits (19eedb3d0424abb235eec1a51457ed0bf3a0e95d)

Author SHA1 Message Date
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 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
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
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
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
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