aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-05-29Merge branch 'bugfix/csp-unproxied' into 'develop'rinpatch
http_security_plug.ex: Fix non-proxied media See merge request pleroma/pleroma!2610
2020-05-29Apply suggestion to lib/pleroma/plugs/http_security_plug.exrinpatch
2020-05-29Merge branch 'connect-src' into 'develop'rinpatch
Add blob: to connect-src CSP, fixes #1827 Closes #1827 See merge request pleroma/pleroma!2608
2020-05-29[#1794] Improvements to hashtags extraction from search query.Ivan Tashkinov
2020-05-29Add blob: to connect-src CSPAlex Gleason
2020-05-29Merge branch 'fix-streaming' into 'develop'lain
Fix argument error in streamer See merge request pleroma/pleroma!2609
2020-05-29Merge branch 'mix/database-vacuum-options' into 'develop'feld
Database vacuum mix task See merge request pleroma/pleroma!2599
2020-05-30Fix argument error in streamerkPherox
`Repo.exists` can't use `nil` as it is unsafe. Use parent object instead of activity because currently Announce activity's context is null.
2020-05-29http_security_plug.ex: Fix non-proxied mediaHaelwenn (lanodan) Monnier
2020-05-29AP C2S: allow limit & order on outbox & read_inboxHaelwenn (lanodan) Monnier
2020-05-29Bugfix: router: allow basic_auth for outboxHaelwenn (lanodan) Monnier
2020-05-29Bugfix: Reuse Controller.Helper pagination for APC2SHaelwenn (lanodan) Monnier
2020-05-29Merge branch 'fix-relay-repeat-notification' into 'develop'lain
Fix relay repeat notification See merge request pleroma/pleroma!2590
2020-05-29Use `User.is_internal_user?` insteadkPherox
2020-05-29Don't make relay announce notificationkPherox
2020-05-29Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'rinpatch
Fix profile emojis bypassing mediaproxy and harden CSP Closes #1810 See merge request pleroma/pleroma!2596
2020-05-29HTTP Security plug: make starting csp string generation more readablerinpatch
2020-05-28Add OpenApi spec to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-28remove deleted media urls from cacheMaksim Pechnikov
2020-05-28Move config actions to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain
Validate actor type See merge request pleroma/pleroma!2593
2020-05-28Update default instance descriptionAlex Gleason
2020-05-28update attachments_cleanup_worker.exMaksim Pechnikov
2020-05-27Abstract out the database maintenance. I'd like to use this from AdminFE too.Mark Felder
2020-05-27Fix minor spelling errorMark Felder
2020-05-27HTTP security plug: Harden img-src and media-src when MediaProxy is enabledrinpatch
2020-05-27HTTP Security plug: rewrite &csp_string/0rinpatch
- Directives are now separated with ";" instead of " ;", according to https://www.w3.org/TR/CSP2/#policy-parsing the space is optional - Use an IO list, which at the end gets converted to a binary as opposed to ++ing a bunch of arrays with binaries together and joining them to a string. I doubt it gives any significant real world advantage, but the code is cleaner and now I can sleep at night. - The static part of csp is pre-joined to a single binary at compile time. Same reasoning as the last point.
2020-05-27AccountView: Use mediaproxy URLs for emojisrinpatch
Also use atom keys in emoji maps instead of binaries Closes #1810
2020-05-27Exclude post actor from to of relay announcekPherox
2020-05-27Merge branch 'refactor-add-mention-step-one' into 'develop'rinpatch
Fix ObjectView calling into strange functions Closes #1807 See merge request pleroma/pleroma!2580
2020-05-27Merge branch 'notification-fixes' into 'develop'rinpatch
Notification performance fixes See merge request pleroma/pleroma!2595
2020-05-27Apply suggestion to ↵Alexander Strizhakov
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-05-27Fix typoEgor Kislitsyn
2020-05-27Notification: Actually preload objects.lain
2020-05-27Merge branch 'fav-speedup' into 'develop'lain
ActivityPub: Change ordering to `nulls last` in favorites query See merge request pleroma/pleroma!2594
2020-05-27ActivityPub: Change ordering to `nulls last` in favorites querylain
This makes it use our existing index and speeds up the query.
2020-05-27validate actor typeAlexander Strizhakov
2020-05-26Merge branch 'fav-speedup' into 'develop'rinpatch
Fix favorites query performance See merge request pleroma/pleroma!2591
2020-05-26Merge branch '1808-pleroma-sucks' into 'develop'rinpatch
Resolve "Don't fail message ingestions when we can't update a user" Closes #1808 See merge request pleroma/pleroma!2576
2020-05-26Merge branch '1813-throttling' into 'develop'rinpatch
Mastodon API Controllers: Use the correct params for rate limiting. Closes #1813 See merge request pleroma/pleroma!2586
2020-05-26Activity.Queries: Use correct actor restriction.lain
2020-05-26Merge branch 'develop' into fix/mediaproxy-http-invalidationMaksim Pechnikov
2020-05-26Fix Oban warningsEgor Kislitsyn
2020-05-26Mastodon API Controllers: Use the correct params for rate limiting.lain
2020-05-26Add AdminAPI.InviteViewEgor Kislitsyn
2020-05-26Add OpenAPI spec for AdminAPI.InviteTokenControllerEgor Kislitsyn
2020-05-26Move invite actions to AdminAPI.InviteTokenControllerEgor Kislitsyn
2020-05-26another view for account in admin-fe status_showAlexander Strizhakov
2020-05-26added deleted_urls in AttachmentsCleanupWorkerMaksim Pechnikov
2020-05-26fix testsMaksim Pechnikov