summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-05-28Merge remote-tracking branch 'pleroma/develop' into endpoint-urlendpoint-urlAlex Gleason
2021-05-28Pleroma.Web.base_url() --> Pleroma.Web.Endpoint.url()Alex Gleason
2021-05-28Merge branch 'cycles-router' into 'develop'feld
2021-05-28Merge branch 'cycles-router-mediaproxy' into 'develop'feld
2021-05-28Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxyAlex Gleason
2021-05-28Don't make MediaProxy be a compile-dep of RouterAlex Gleason
2021-05-28Merge remote-tracking branch 'pleroma/develop' into cycles-routerAlex Gleason
2021-05-28Router: move StaticFEPlug to a pipelineAlex Gleason
2021-05-27Merge branch 'featured-totalItems' into 'develop'Haelwenn
2021-05-27Missing entry for pinned posts federation from MR !3312Mark Felder
2021-05-27Provide totalItems field for featured collectionsMark Felder
2021-05-26Merge branch 'feat/expose_email_to_self' into 'develop'Haelwenn
2021-05-22Merge branch 'mix_config_deprecation' into 'develop'Haelwenn
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-18Merge branch 'chore/changelog' into 'develop'feld
2021-05-18Clarify AttachmentMetadata changesMark Felder
2021-05-18Merge branch 'blurhash' into 'develop'feld
2021-05-18Fixed checking for Upload Filter required commandsMark Felder
2021-05-18Check AnalyzeMetadata filter's required commandsMark Felder
2021-05-18Rename upload filter to AnalyzeMetadataMark Felder
2021-05-17Merge branch 'optional-config' into 'develop'lain
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-04Merge branch 'dont-crash-email-settings' into 'develop'feld
2021-05-04Merge branch 'earmark' into 'develop'feld
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
2021-05-01CHANGELOG: markdownearmarkAlex 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
2021-04-29Merge remote-tracking branch 'upstream/develop' into oauth-token-idAlex Gleason
2021-04-29Merge branch 'maybe-fix-ci' into 'develop'feld
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