summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-06-01Merge remote-tracking branch 'pleroma/develop' into cycles-config-urlcycles-config-urlAlex Gleason
2021-06-01Pleroma.User.avatar_url/2 --> Pleroma.User.Media.avatar_url/2Alex Gleason
2021-06-01Introduce Pleroma.Config.url/0Alex Gleason
2021-06-01Merge commit '51a9f97e87823cbd9e92c375f4bc4c0bfa8b79db'; commit 'a744c47e9a43...Alex Gleason
2021-06-01Merge branch 'cycles-streaming' into 'develop'feld
2021-06-01Merge branch 'cycles-uploader' into 'develop'feld
2021-06-01Merge remote-tracking branch 'pleroma/develop' into cycles-uploaderAlex Gleason
2021-06-01Remove deps from Uploader behaviourAlex Gleason
2021-06-01Merge remote-tracking branch 'pleroma/develop' into cycles-streamingAlex Gleason
2021-06-01Remove deps from Streaming/Persisting behaviorsAlex Gleason
2021-06-01Merge branch 'cycles-constants' into 'develop'feld
2021-06-01Merge remote-tracking branch 'pleroma/develop' into cycles-constantsAlex Gleason
2021-06-01Merge branch 'cycles-frontend-static' into 'develop'feld
2021-06-01Merge branch 'cycles-base-url' into 'develop'feld
2021-06-01Merge branch 'features/validators-note' into 'develop'Haelwenn
2021-05-31Merge remote-tracking branch 'pleroma/develop' into cycles-base-urlAlex Gleason
2021-05-31Deprecate Pleroma.Web.base_url/0Alex Gleason
2021-05-31Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_loca...Alex Gleason
2021-05-31Merge branch 'docs/goto-libera' into 'develop'Haelwenn
2021-05-31Changing references of freenode to libera.chatHaelwenn (lanodan) Monnier
2021-05-31Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
2021-05-30Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad...Alex Gleason
2021-05-30Translated using Weblate (Chinese (Traditional))Snow
2021-05-30Translated using Weblate (Chinese (Traditional))Snow
2021-05-30Added translation using Weblate (Chinese (Traditional))Snow
2021-05-30Merge branch 'ffmpeg' into 'develop'Haelwenn
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-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