summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-29Add blob: to connect-src CSPAlex Gleason
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-28Merge branch 'fix/1557-gets-local-pack' into 'develop'lain
get-packs for local generated pack Closes #1557 See merge request pleroma/pleroma!2604
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain
Validate actor type See merge request pleroma/pleroma!2593
2020-05-28Merge branch 'update-install-guides' into 'develop'lain
Update installation guides See merge request pleroma/pleroma!2603
2020-05-28get-packs for local generated packAlexander Strizhakov
2020-05-28Update installation guidesEgor Kislitsyn
2020-05-28Merge branch 'chore/fix-spelling' into 'develop'rinpatch
Fix minor spelling error See merge request pleroma/pleroma!2598
2020-05-27Fix minor spelling errorMark Felder
2020-05-27Merge branch 'bundle/adminfe-20200527' into 'develop'rinpatch
Update AdminFE build, re-enables emoji packs See merge request pleroma/pleroma!2597
2020-05-27Update AdminFE build, re-enables emoji packsMark 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-27MediaProxy test: use config macros instead of directly putting valuesrinpatch
They were not properly cleaned later and caused trouble for another tests
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-27Migrations: Make user_id index on notifications better for query.lain
2020-05-27Apply suggestion to ↵Alexander Strizhakov
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
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 'apps-index' into 'develop'rinpatch
Migrations: Add index on client_id and client_secret for apps. See merge request pleroma/pleroma!2589
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-26Migrations: Add index on client_id and client_secret for apps.lain
Greatly speeds up app lookup.
2020-05-26Merge branch 'restore-new-image' into 'develop'lain
Config: Restore old new background image See merge request pleroma/pleroma!2588
2020-05-26Config: Restore old new background imagelain
Became lost in a settings restructure
2020-05-26Merge branch 'fix/oban-warnings' into 'develop'lain
Fix Oban warnings See merge request pleroma/pleroma!2587
2020-05-26Fix Oban warningsEgor Kislitsyn
2020-05-26Mastodon API Controllers: Use the correct params for rate limiting.lain
2020-05-26Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'lain
[#1501] Made user feed contain public and unlisted activities Closes #1501 See merge request pleroma/pleroma!2584
2020-05-26Merge branch 'skip-crypt-test' into 'develop'lain
Skip failing `:crypt` test on mac See merge request pleroma/pleroma!2583
2020-05-25[#1501] Made user feed contain public and unlisted activities.Ivan Tashkinov
2020-05-25Skip failing `:crypt` test on macEgor Kislitsyn
2020-05-25Merge branch '1471-tuning-advice' into 'develop'lain
Docs: Document reasonable Postgres settings. See merge request pleroma/pleroma!2581
2020-05-25Docs: sql -> SQLlain
2020-05-25Apply suggestion to docs/installation/otp_en.mdlain
2020-05-25Docs: Document reasonable Postgres settings.lain
2020-05-25Transmogrifier: Use a simpler way to get mentions.lain
2020-05-25User: Change signature of get_users_from_setlain
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1808-pleroma-sucks
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 19:18:22 +0000