summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-10Merge branch 'fix/compilation-error-docs' into 'develop'rinpatch
Fix a compilation error under certain circumstances See merge request pleroma/pleroma!2193
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-09Merge branch 'fix/email-task-otp' into 'develop'rinpatch
Fix email mix task on OTP releases Closes #1548 See merge request pleroma/pleroma!2191
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-07Merge branch 'questions-timezone' into 'develop'rinpatch
Questions: Add timezone to `closed` property Closes #1552 See merge request pleroma/pleroma!2184
2020-02-07Questions: Add timezone to `closed` propertyLain Soykaf
2020-02-07deps: update plug to 1.9rinpatch
Includes functionality needed to fix upload limit not being changed at runtime: https://github.com/elixir-plug/plug/commit/087cd64d864696c74bf07f935e2ae31caec19a1e
2020-02-07Add User.get_follow_state/2Egor Kislitsyn
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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 10:46:53 +0000