summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-06Simplify in-database config docsrinpatch
Large part of it was no longer true (i.e none of the changes need recompilation anymore and you can't brick an instance by changing them, it's not necessary to manually truncate the db manually anymore)
2020-02-04Merge branch 'feature/make_attachments_cleanup_optional' into 'develop'lain
Make attachments cleanup optional See merge request pleroma/pleroma!2170
2020-02-04Add cheatsheet entryLain Soykaf
2020-01-31Make attachments cleanup optionalRoman Chvanikov
2020-01-30Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'rinpatch
Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064
2020-01-30Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhostrinpatch
2020-01-30Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'lain
Re-enable rate limiter and enable remote ip See merge request pleroma/pleroma!2164
2020-01-30Apply suggestion to docs/configuration/cheatsheet.mdlain
2020-01-30Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop'lain
Emoji Reactions: Actually use the validation. See merge request pleroma/pleroma!2166
2020-01-30Emoji Reactions: Add fixtureslain
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-30Apply suggestion to docs/configuration/cheatsheet.mdrinpatch
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-30cheatsheet: improve rate limiter docs and add new limitersrinpatch
2020-01-30config.exs: Re-enable rate limiter and enable remote iprinpatch
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