aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-06description changeAlexander Strizhakov
2020-02-06dropdown typeAlexander Strizhakov
2020-02-06removing confusing errorAlexander Strizhakov
2020-02-05Merge branch 'fix/unpinnable-polls' into 'develop'rinpatch
fix not being able to pin polls See merge request pleroma/pleroma!2172
2020-02-05Merge branch 'removing-admin-api-endpoint' into 'develop'rinpatch
Removing migrate_from_db endpoint from admin api See merge request pleroma/pleroma!2177
2020-02-05Merge branch 'remove-linker-scheme-option' into 'develop'feld
Remove AutoLinker `scheme` option from the config See merge request pleroma/pleroma!2176
2020-02-05Apply suggestion to CHANGELOG.mdAlexander Strizhakov
2020-02-05removing migrate_from_db endpoint from admin apiAlexander Strizhakov
2020-02-05Remove AutoLinker `scheme` option from the configEgor Kislitsyn
2020-02-05Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'rinpatch
Restarting pleroma from outside application See merge request pleroma/pleroma!2144
2020-02-05Add support for cancellation of a follow requestEgor Kislitsyn
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-02-03Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-02fix not being able to pin pollsrinpatch
2020-02-02mastodon API: do not sanitize html in non-html fieldsrinpatch
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-28Merge branch 'develop' into issue/1383Maksim Pechnikov
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