aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-07Merge branch 'rename_emoji_reactios' into 'develop'rinpatch
EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181
2020-02-07Merge branch 'docs-fix' into 'develop'rinpatch
Fix for config.md See merge request pleroma/pleroma!2182
2020-02-07fixAlexander Strizhakov
2020-02-06EmojiReactions: Rename to EmojiReactsLain Soykaf
2020-02-06Merge branch 'update/fe-bundle-20200206' into 'develop'rinpatch
Update FE bundle See merge request pleroma/pleroma!2180
2020-02-06Update FE bundleMark Felder
2020-02-06Merge branch 'mastoapi-non-html-strings' into 'develop'feld
mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167
2020-02-06Merge branch 'fix/dymamic-docs' into 'develop'feld
Simplify in-database config docs See merge request pleroma/pleroma!2178
2020-02-06Merge branch 'config-changes' into 'develop'feld
Config changes Closes #1547 See merge request pleroma/pleroma!2174
2020-02-06Update CHANGELOGEgor Kislitsyn
2020-02-06Cancellation of a follow request for a remote userEgor Kislitsyn
2020-02-06Merge branch 'develop' into fix/dymamic-docsrinpatch
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-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-05Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 12:18:45 +0000