aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-26Merge branch 'feat/expose_email_to_self' into 'develop'Haelwenn
Expose user email address to user/owner; not publicly. See merge request pleroma/pleroma!3412
2021-05-22Merge branch 'mix_config_deprecation' into 'develop'Haelwenn
Switch from the deprecated "use Mix.config" to "import Config" See merge request pleroma/pleroma!3413
2021-05-20Switch from the deprecated "use Mix.config" to "import Config"Mark Felder
2021-05-20Expose user email address to user/owner; not publicly.Mark Felder
2021-05-19Merge remote-tracking branch 'pleroma/develop' into plug-runtime-devAlex Gleason
2021-05-19Put Plugs in runtime mode in :dev, :test to speed up recompilationAlex Gleason
2021-05-19Merge remote-tracking branch 'pleroma/develop' into alias-router-helpersAlex Gleason
2021-05-18Switch to aliasing `Router.Helpers` instead of importingAlex Gleason
2021-05-18Merge branch 'chore/changelog' into 'develop'feld
Clarify AttachmentMetadata changes See merge request pleroma/pleroma!3408
2021-05-18Clarify AttachmentMetadata changesMark Felder
2021-05-18Merge branch 'blurhash' into 'develop'feld
Upload filter for media metadata (Support blurhash, get WxH) See merge request pleroma/pleroma!3404
2021-05-18Fixed checking for Upload Filter required commandsMark Felder
2021-05-18Check AnalyzeMetadata filter's required commandsMark Felder
eblurhash:magick uses "convert" Fetching image metadata uses "mogrify"
2021-05-18Rename upload filter to AnalyzeMetadataMark Felder
2021-05-17Merge branch 'optional-config' into 'develop'lain
Save ~10 minutes on source installation See merge request pleroma/pleroma!3406
2021-05-16Merge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exsAlex Gleason
2021-05-16gitignore `config/runtime.exs`Alex Gleason
2021-05-16Merge remote-tracking branch 'pleroma/develop' into optional-configAlex Gleason
2021-05-16Docs: use `MIX_ENV=prod mix pleroma.instance gen`Alex Gleason
2021-05-16Make prod.secret.exs optional (with warning)Alex Gleason
2021-05-14Merge remote-tracking branch 'upstream/attachment-meta' into blurhashAlex Gleason
2021-05-14Support blurhashAlex Gleason
2021-05-12Changelog: attachment metaattachment-metaAlex Gleason
2021-05-12Merge remote-tracking branch 'upstream/develop' into attachment-metaAlex Gleason
2021-05-12Federate attachments as Links instead of DocumentsAlex Gleason
2021-05-12Don't render media `meta` if nilAlex Gleason
2021-05-12Ingest remote attachment width/heightAlex Gleason
2021-05-12Add SetMeta filter to store uploaded image sizesAlex Gleason
2021-05-07Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leakAlex Gleason
2021-05-04Merge branch 'dont-crash-email-settings' into 'develop'feld
Don't crash so hard when email settings are invalid Closes #2606 See merge request pleroma/pleroma!3400
2021-05-04Merge branch 'earmark' into 'develop'feld
Upgrade Earmark to v1.4.15 Closes #1942 and #2026 See merge request pleroma/pleroma!3076
2021-05-03CHANGELOG: don't crash so hard when email settings are invalidAlex Gleason
2021-05-03Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settingsAlex Gleason
2021-05-03Don't crash when email settings are invalidAlex Gleason
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606 Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
2021-05-01CHANGELOG: markdownearmarkAlex Gleason
2021-04-30CHANGELOG: SimplePolicy embedded objects are now checkedAlex Gleason
2021-04-30Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leakAlex Gleason
2021-04-30SimplePolicy: filter string ObjectsAlex Gleason
2021-04-30SimplePolicy: filter nested objectsAlex Gleason
2021-04-30Merge remote-tracking branch 'upstream/develop' into earmarkAlex Gleason
2021-04-30Fix failing remote mentions test, valid TLDsAlex Gleason
2021-04-30Delete obsolete EarmarkRendereTests (moved to UtilsTest)Alex Gleason
2021-04-30Remove Pleroma.Formatter.minify/2Alex Gleason
2021-04-30Upgrade Earmark 1.4.15Alex Gleason
2021-04-29Merge branch 'oauth-token-id' into 'develop'feld
Return token's primary key with POST /oauth/token See merge request pleroma/pleroma!3380
2021-04-29Merge remote-tracking branch 'upstream/develop' into oauth-token-idAlex Gleason
2021-04-29Merge branch 'maybe-fix-ci' into 'develop'feld
CI: Purge pleroma build directory between runs See merge request pleroma/pleroma!3399
2021-04-29CI: Purge pleroma build directory between runsAlex Gleason
2021-04-29CHANGELOG: Return OAuth token `id`Alex Gleason
2021-04-29Merge remote-tracking branch 'upstream/develop' into oauth-token-idAlex Gleason