summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-30Previewing proxy proof of conceptthumbnail-proxylain
2020-01-30Emoji Reactions: Actually use the validation.lain
2020-01-30Merge branch 'emoji-api-errors' into 'develop'feld
Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161
2020-01-30Merge branch 'http-security-warning' into 'develop'feld
Warn if HTTPSecurityPlug is disabled Closes #1528 See merge request pleroma/pleroma!2155
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-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-29Merge branch 'changelog-update' into 'develop'lain
Update confusing changelog message for attachments cleanup See merge request pleroma/pleroma!2163
2020-01-29Update confusing changelog message for attachments cleanupRoman Chvanikov
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-29Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma ↵lain
into fix-streaming-reblog
2020-01-29Streamer Tests: code readability improvementslain
2020-01-29Emoji Reactions: Correctly handle deleted userslain
2020-01-29Emoji Reactions: Document changeslain
2020-01-29Emoji Reactions: Add `reacted` field to emoji reactionslain
2020-01-29Merge branch 'meta-tags-parser' into 'develop'lain
Title parsing improvement See merge request pleroma/pleroma!2159
2020-01-29title parse improvementAlexander Strizhakov
2020-01-28Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' ↵lain
into 'develop' Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9 See merge request pleroma/pleroma!2158
2020-01-28Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9lain
2020-01-28Merge branch 'linkify-test-expansion' into 'develop'lain
Formatter: Add a test for domain / username clashes See merge request pleroma/pleroma!2151
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 'feature/tag_feed' into 'develop'lain
[#1452] Atom feeds for hashtags See merge request pleroma/pleroma!2040
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-28Update streamer_test.exslain
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-28Merge branch 'fix-elixir-v1.10' into 'develop'lain
Fix compatibility with Elixir v1.10 See merge request pleroma/pleroma!2153
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
Translation/errors french See merge request pleroma/pleroma!1457
2020-01-28Merge branch 'docs_introduction' into 'develop'lain
DOCS General update for the "Introduction to Pleroma" section See merge request pleroma/pleroma!2101
2020-01-28DOCS General update for the "Introduction to Pleroma" sectionIlja
* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check) * Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check) * Added a newline above the bulletpoints because otherwise they are broken on docs-develop * Remove the :smile: thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis * Add a link to fediverse.network * Update to add new stuff and fix things that aren't correct (any more)
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-28Formatter: Add a test for domain / username clasheslain
2020-01-28update ectoMaksim Pechnikov
2020-01-28Remove unused varRoman Chvanikov
generated by cgit v1.2.3 (git 2.44.0) at 2024-04-28 16:12:49 +0000