aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-02-11Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"feld
This reverts merge request !2194
2020-02-11Make Floki use fast_htmlrinpatch
2020-02-11Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulgelain
2020-02-11Merge branch 'issue/1383' into 'develop'rinpatch
[#1383] Switch periodic jobs from quantum to oban See merge request pleroma/pleroma!2015
2020-02-10Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-10Fix a compilation error under certain circumstancesrinpatch
I've noticed that sometimes when switching from develop to stable and back, develop fails to compile and rm -r ing the _build and deps dirs doesn't help at all. This is due to Admin API controller needing to generate JSON description of the config at compile time. Evaluating `config/description.exs` calls `Generator.list_modules_in_dir/2`, which in turn predicts the module names of files in the directory and tries to convert the predicted name to *existing* atoms. Sometimes the compiler will call that function before compiling the modules in the said directory, so the conversion will of course fail. This fixes it by removing the requirement of the atoms being existent. The function is not subjected to any untrusted user input so this should be safe. An ideal fix would be to block the compilation of docs before all modules are compiled and then get a list of compiled elixir modules under the namespace we want instead of directory hacks, but I have not been able to figure out how to do that.
2020-02-09Fix email mix task on OTP releasesrinpatch
Closes pleroma#1548
2020-02-08Merge branch 'fix/upload-limit-otp' into 'develop'lain
Actually fix upload limit on OTP releases Closes #1109 See merge request pleroma/pleroma!2185
2020-02-07Actually fix upload limit on OTP releasesrinpatch
Closes #1109
2020-02-07Merge branch 'cancel-follow-request' into 'develop'Haelwenn
Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175
2020-02-07Questions: Add timezone to `closed` propertyLain Soykaf
2020-02-07EmojiReactions: Remove old API endpointsLain Soykaf
2020-02-07EmojiReactions: Add Mastodon-aligned reaction endpoints, change responseLain Soykaf
2020-02-07Add User.get_follow_state/2Egor Kislitsyn
2020-02-06EmojiReactions: Rename to EmojiReactsLain Soykaf
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-06Cancellation of a follow request for a remote userEgor Kislitsyn
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-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-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-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-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-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-29Fix credo warningEgor Kislitsyn
2020-01-29Make the warning more scarierEgor Kislitsyn
2020-01-29emoji api error on not writable dirAlexander Strizhakov
2020-01-29Emoji Reactions: Correctly handle deleted userslain
2020-01-29Emoji Reactions: Add `reacted` field to emoji reactionslain
2020-01-29title parse improvementAlexander Strizhakov
2020-01-28Merge branch 'develop' into issue/1383Maksim Pechnikov
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