aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-30Fix argument error in streamerkPherox
2020-05-29Merge branch 'fix-relay-repeat-notification' into 'develop'lain
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
2020-05-29HTTP Security plug: make starting csp string generation more readablerinpatch
2020-05-28Merge branch 'fix/1557-gets-local-pack' into 'develop'lain
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain
2020-05-28Merge branch 'update-install-guides' into 'develop'lain
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
2020-05-27Fix minor spelling errorMark Felder
2020-05-27Merge branch 'bundle/adminfe-20200527' into 'develop'rinpatch
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
2020-05-27AccountView: Use mediaproxy URLs for emojisrinpatch
2020-05-27MediaProxy test: use config macros instead of directly putting valuesrinpatch
2020-05-27Exclude post actor from to of relay announcekPherox
2020-05-27Merge branch 'refactor-add-mention-step-one' into 'develop'rinpatch
2020-05-27Merge branch 'notification-fixes' into 'develop'rinpatch
2020-05-27Migrations: Make user_id index on notifications better for query.lain
2020-05-27Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controlle...Alexander Strizhakov
2020-05-27Notification: Actually preload objects.lain
2020-05-27Merge branch 'fav-speedup' into 'develop'lain
2020-05-27ActivityPub: Change ordering to `nulls last` in favorites querylain
2020-05-27validate actor typeAlexander Strizhakov
2020-05-26Merge branch 'fav-speedup' into 'develop'rinpatch
2020-05-26Merge branch '1808-pleroma-sucks' into 'develop'rinpatch
2020-05-26Merge branch 'apps-index' into 'develop'rinpatch
2020-05-26Merge branch '1813-throttling' into 'develop'rinpatch
2020-05-26Activity.Queries: Use correct actor restriction.lain
2020-05-26Migrations: Add index on client_id and client_secret for apps.lain
2020-05-26Merge branch 'restore-new-image' into 'develop'lain
2020-05-26Config: Restore old new background imagelain
2020-05-26Merge branch 'fix/oban-warnings' into 'develop'lain
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
2020-05-26Merge branch 'skip-crypt-test' into 'develop'lain
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
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 1808-plerom...lain