aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-05-30Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-staticAlex Gleason
2021-05-30FrontendStatic: make Router a runtime depAlex Gleason
2021-05-30Add ffmpegshibao
2021-05-29Merge branch 'cycles-views' into 'develop'feld
2021-05-29Merge branch 'cycles-html' into 'develop'feld
2021-05-29Merge branch 'cycles-gun' into 'develop'feld
2021-05-29Merge branch 'cycles-config' into 'develop'feld
2021-05-29Merge branch 'cycles-pipeline' into 'develop'feld
2021-05-29Merge remote-tracking branch 'pleroma/develop' into cycles-pipelineAlex Gleason
2021-05-29ActivityPub.Pipeline: switch to runtime depsAlex Gleason
2021-05-29Merge remote-tracking branch 'pleroma/develop' into cycles-htmlAlex Gleason
2021-05-29Break out activity-specific HTML functions into Pleroma.Activity.HTMLAlex Gleason
2021-05-29Merge remote-tracking branch 'pleroma/develop' into cycles-viewsAlex Gleason
2021-05-29Create real Views for all ControllersAlex Gleason
2021-05-29Merge remote-tracking branch 'pleroma/develop' into cycles-plugsAlex Gleason
2021-05-29Config: use runtime deps instead of module attributesAlex Gleason
2021-05-29Merge remote-tracking branch 'pleroma/develop' into cycles-gunAlex Gleason
2021-05-29Gun: use runtime deps in ConnectionPoolAlex Gleason
2021-05-29Gun: make Gun.API a runtime depAlex Gleason
2021-05-29Adding descriptionSnow
2021-05-28Merge branch 'cycles-router-api-routes' into 'develop'feld
2021-05-28Merge branch 'simplepolicy-announce-leak' into 'develop'feld
2021-05-28Merge branch 'gitignore-runtime-exs' into 'develop'feld
2021-05-28Merge branch 'alias-router-helpers' into 'develop'feld
2021-05-28Merge branch 'plug-runtime-dev' into 'develop'feld
2021-05-28Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routesAlex Gleason
2021-05-28Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0Alex 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-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
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