summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-01-31Revert "Merge branch 'feature/attachments-cleanup' into 'develop'"revert/attachment-cleanuprinpatch
2020-01-29Merge branch 'fix-streaming-reblog' into 'develop'Haelwenn
2020-01-29Merge branch 'changelog-update' into 'develop'lain
2020-01-29Update confusing changelog message for attachments cleanupRoman Chvanikov
2020-01-29Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma int...lain
2020-01-29Streamer Tests: code readability improvementslain
2020-01-29Merge branch 'meta-tags-parser' into 'develop'lain
2020-01-29title parse improvementAlexander Strizhakov
2020-01-28Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into...lain
2020-01-28Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9lain
2020-01-28Merge branch 'linkify-test-expansion' into 'develop'lain
2020-01-28Merge branch 'features/task-test-email' into 'develop'lain
2020-01-28Merge branch 'fix/1524-link_preview' into 'develop'lain
2020-01-28meta tag parser respect first title headerAlexander Strizhakov
2020-01-28Merge branch 'feature/tag_feed' into 'develop'lain
2020-01-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag...lain
2020-01-28Merge branch 'whole-db-removal' into 'develop'Haelwenn
2020-01-28Create pleroma.email mix taskHaelwenn (lanodan) Monnier
2020-01-28Update streamer_test.exslain
2020-01-28Streamer: Correctly handle reblog muteslain
2020-01-28Merge branch 'fix/attachments-cleanup' into 'develop'feld
2020-01-28Merge branch 'fix-elixir-v1.10' into 'develop'lain
2020-01-28Fix compatibility with Elixir v1.10Egor Kislitsyn
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 'translation/errors-french' into 'develop'lain
2020-01-28Merge branch 'docs_introduction' into 'develop'lain
2020-01-28DOCS General update for the "Introduction to Pleroma" sectionIlja
2020-01-28Merge branch 'support/update_ecto' into 'develop'lain
2020-01-28Merge branch 'fix/attachments-cleanup' into 'develop'lain
2020-01-28Formatter: Add a test for domain / username clasheslain
2020-01-28update ectoMaksim Pechnikov
2020-01-28Remove unused varRoman Chvanikov
2020-01-28explicitly describe perform op in AttachmentsClenupWorkerRoman Chvanikov
2020-01-27fix testMaksim Pechnikov
2020-01-27Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-27Merge branch 'remove/suggestions-third-party-engine' into 'develop'Haelwenn
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-27Merge branch 'descriptions-fixes' into 'develop'Haelwenn
2020-01-27little fixesAlexander Strizhakov
2020-01-27Fix typoRoman Chvanikov
2020-01-26Merge branch 'fix/runtime-config' into 'develop'feld
2020-01-26Merge branch 'issue/1280' into 'develop'feld
2020-01-26Merge branch 'develop' into issue/1280Mark Felder
2020-01-26Merge branch 'fix/descriptions' into 'develop'feld
2020-01-25description typos, Oban verbose type fix, new keysAlexander Strizhakov