aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Expand)Author
2020-05-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
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-28get-packs for local generated packAlexander Strizhakov
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
2020-05-27AccountView: Use mediaproxy URLs for emojisrinpatch
2020-05-27Merge branch 'refactor-add-mention-step-one' into 'develop'rinpatch
2020-05-27Merge branch 'notification-fixes' into 'develop'rinpatch
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 '1813-throttling' into 'develop'rinpatch
2020-05-26Activity.Queries: Use correct actor restriction.lain
2020-05-26Fix Oban warningsEgor Kislitsyn
2020-05-26Mastodon API Controllers: Use the correct params for rate limiting.lain
2020-05-25[#1501] Made user feed contain public and unlisted activities.Ivan Tashkinov
2020-05-25Streamer: Don't crash on streaming chat notificationslain
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
2020-05-25Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-25Merge branch 'openapi/admin/status' into 'develop'lain
2020-05-25User: Don't error out if we want to refresh a user but can'tlain
2020-05-24Merge branch 'mastodon-migration-compat' into 'develop'rinpatch
2020-05-22Merge branch 'feature/configure-filename-truncate' into 'develop'lain
2020-05-22Apply suggestion to lib/pleroma/web/common_api/utils.exRoman Chvanikov
2020-05-22Add filename_display_max_length configRoman Chvanikov
2020-05-22OStatusController: Add Mastodon activity compat route.lain
2020-05-22ActivityPubController: Add Mastodon activity compat route.lain
2020-05-22OStatusController: Add Mastodon compatibility route for objects.lain
2020-05-22Merge branch 'emoji-react-better-errors' into 'develop'rinpatch
2020-05-22Fix notifications mark as read APIEgor Kislitsyn
2020-05-22ActivityPubController: Add Mastodon compatibility route.lain
2020-05-22EmojiReactionController: Return more appropriate error.lain
2020-05-22Merge branch 'announce-validator' into 'develop'Haelwenn
2020-05-22Merge branch '1113-op-mentioning' into 'develop'Haelwenn
2020-05-21Merge branch 'issue/1707' into 'develop'lain
2020-05-21Merge branch 'admin-logo-upload' into 'develop'lain
2020-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-05-21Merge branch 'features/emoji_stealer' into 'develop'lain
2020-05-21Merge branch 'openapi/pleroma-api/pleroma' into 'develop'lain
2020-05-21Merge branch 'issue/749' into 'develop'lain