aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-01-30Update emoji_api_controller.exfeld
2020-01-30Update http_security_plug.exfeld
2020-01-30Merge branch 'emoji-reactions-reacted' into 'develop'rinpatch
Emoji reactions: Add `reacted` field See merge request pleroma/pleroma!2160
2020-01-30RemoteIp: only trust X-Forwarded-Forrinpatch
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
2020-01-29Merge branch 'fix-streaming-reblog' into 'develop'Haelwenn
Streamer: Correctly handle reblog mutes Closes #1129 and #1438 See merge request pleroma/pleroma!2156
2020-01-29Fix credo warningEgor Kislitsyn
2020-01-29Make the warning more scarierEgor Kislitsyn
2020-01-29emoji api error on not writable dirAlexander Strizhakov
2020-01-29Emoji Reactions: Correctly handle deleted userslain
2020-01-29Emoji Reactions: Add `reacted` field to emoji reactionslain
2020-01-29title parse improvementAlexander Strizhakov
2020-01-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/remote-follow-userpage-redirect
2020-01-28Merge branch 'features/task-test-email' into 'develop'lain
Create pleroma.email mix task Closes #1061 See merge request pleroma/pleroma!2118
2020-01-28Merge branch 'fix/1524-link_preview' into 'develop'lain
Meta tags parser respects first title tag Closes #1524 See merge request pleroma/pleroma!2157
2020-01-28meta tag parser respect first title headerAlexander Strizhakov
2020-01-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/tag_feed
2020-01-28Merge branch 'whole-db-removal' into 'develop'Haelwenn
Remove `whole_db` parameter everywhere, it's not used anymore See merge request pleroma/pleroma!2152
2020-01-28Create pleroma.email mix taskHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28Streamer: Correctly handle reblog muteslain
2020-01-28Warn if HTTPSecurityPlug is disabledEgor Kislitsyn
2020-01-28Merge branch 'fix/attachments-cleanup' into 'develop'feld
Fix attachments cleanup with custom base_url See merge request pleroma/pleroma!2154
2020-01-28Add test for custom base_url when deleting an attachmentRoman Chvanikov
2020-01-28Fix base_url string trimmingRoman Chvanikov
2020-01-28Add loggingRoman Chvanikov
2020-01-28Remove `whole_db` parameter everywhere, it's not used anymorelain
2020-01-28Apply suggestion to lib/pleroma/web/feed/tag_controller.exlain
2020-01-28Fix __MODULE__ usageRoman Chvanikov
2020-01-28Merge branch 'support/update_ecto' into 'develop'lain
updated ecto and fixed warning See merge request pleroma/pleroma!2150
2020-01-28Merge branch 'fix/attachments-cleanup' into 'develop'lain
Fix/attachments cleanup See merge request pleroma/pleroma!2148
2020-01-28update ectoMaksim Pechnikov
2020-01-28Remove unused varRoman Chvanikov
2020-01-28explicitly describe perform op in AttachmentsClenupWorkerRoman Chvanikov
2020-01-27Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-27Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-27Fix typoRoman Chvanikov
2020-01-26Merge branch 'fix/runtime-config' into 'develop'feld
Fixes for runtime config See merge request pleroma/pleroma!2143
2020-01-26Merge branch 'develop' into issue/1280Mark Felder
2020-01-25restarting pleroma from outside applicationAlexander Strizhakov
2020-01-25[#1505] Background fetching of incoming activities' `replies` collections.Ivan Tashkinov
2020-01-25can be changed in runtimeAlexander Strizhakov
2020-01-24added atom feedMaksim Pechnikov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-24Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'rinpatch
Fix for non existing atom Closes #1532 See merge request pleroma/pleroma!2139
2020-01-24Merge branch 'emoji-reaction-sanity-check' into 'develop'rinpatch
Emoji reactions: Add sanity checks for the cache See merge request pleroma/pleroma!2132
2020-01-24Emoji reactions: Change api format once morelain
2020-01-24fix for non existing atomAlexander Strizhakov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23parsing Swoosh modulesAlexander Strizhakov