aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-01-31Revert "Merge branch 'feature/attachments-cleanup' into 'develop'"revert/attachment-cleanuprinpatch
This reverts commit a431e8c9f7033c739e10b0e8b34c75f2cc1d38d4, reversing changes made to 8b4d81609d5627d62b826bcd3e87290cb513495f.
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-29title parse improvementAlexander Strizhakov
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-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-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-25can be changed in runtimeAlexander Strizhakov
2020-01-25respect settings from database in mix tasksAlexander 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
2020-01-23restart config id after truncateAlexander Strizhakov
2020-01-23truncate config table on migrate to db taskAlexander Strizhakov
2020-01-23Emoji reactions: Add sanity checks for the cachelain
2020-01-23Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23Merge branch 'emoji-notifications' into 'develop'Haelwenn
Emoji notifications See merge request pleroma/pleroma!2130
2020-01-22Notifications: Add emoji reaction notificationslain
2020-01-22Merge branch 'no-error-404' into 'develop'rinpatch
Log at debug level for object deletion, not error. See merge request pleroma/pleroma!2066
2020-01-22Merge branch 'admin-be' into 'develop'feld
Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976
2020-01-22Merge branch 'emoji-reaction-extensions-2' into 'develop'rinpatch
Emoji Reactions: In the API, sort them by first emoji insertion date See merge request pleroma/pleroma!2126
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-22support for updating env after settings deletionAlexander Strizhakov
2020-01-22Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov