summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2023-12-16Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into docker-composedocker-composeLain Soykaf
2023-12-16Merge branch 'mergeback/2.6.1' into 'develop'Haelwenn
2023-12-15Skip changelog for 2.6.1 mergebacktusooa
2023-12-15Merge remote-tracking branch 'upstream/stable' into mergeback/2.6.1tusooa
2023-12-16Merge branch 'release/2.6.1' into 'stable'v2.6.1tusooa
2023-12-15Fix formatting of changelogHaelwenn
2023-12-15Dockerfile: Update elixir and erlang versionLain Soykaf
2023-12-15Add a basic docker-compose exampleLain Soykaf
2023-12-15Merge branch 'service-actor-outbox' into 'develop'lain
2023-12-15UserViewTest: Add basice service actor test.Lain Soykaf
2023-12-15ap userview: add outbox field.Yonle
2023-12-14Bundle 2.6.1 frontendtusooa
2023-12-14Bump version to 2.6.1tusooa
2023-12-14changelog.d/system-cflags.fix: New entryHaelwenn (lanodan) Monnier
2023-12-14mix: Bump elixir-captcha for system-CFLAGSHaelwenn (lanodan) Monnier
2023-12-14mix: cherry-pick eblurhash latest git for system-CFLAGSHaelwenn (lanodan) Monnier
2023-12-14TwitterAPI: Return proper error when healthcheck is disabledHaelwenn (lanodan) Monnier
2023-12-14docs: clang is also supportedHaelwenn (lanodan) Monnier
2023-12-14docs: Put a max version on erlang and elixirHaelwenn (lanodan) Monnier
2023-12-14changelogHenry Jameson
2023-12-14update, add imagesHenry Jameson
2023-12-14Initial draft on frontends managementHenry Jameson
2023-12-13Merge branch 'fix-develop-tests' into 'develop'lain
2023-12-13Gitlab CI: Switch to our own docker hubLain Soykaf
2023-12-13Gitlab CI: Update postgres for rum tests.Lain Soykaf
2023-12-13StatusViewTest: Fix tests.Lain Soykaf
2023-12-13Merge branch 'add-opengraph-rich-media-proxy' into 'develop'lain
2023-12-12Merge branch 'no-async-clear-config' into 'develop'lain
2023-12-12Revert "EmailTest: use config mock"Lain Soykaf
2023-12-12Revert "Tests: fix more tests"Lain Soykaf
2023-12-12Add media proxy to opengraph rich media cardsAlexander Tumin
2023-12-12LintingLain Soykaf
2023-12-12Tests: fix more testsLain Soykaf
2023-12-12EmailTest: use config mockLain Soykaf
2023-12-12Tests: Remove `skip_on_mac` tagLain Soykaf
2023-12-12Tests: More test fixesLain Soykaf
2023-12-12RichMediaTest: Use mocked configLain Soykaf
2023-12-12Merge branch 'docker-fix-22' into 'develop'lain
2023-12-12Fix dockerfile compilation.Lain Soykaf
2023-12-12ScheduledActivityControllerTest: Fix tests, make async.Lain Soykaf
2023-12-12MastodonAPITest: Fix testsLain Soykaf
2023-12-12ScheduledActivity: Use config mockingLain Soykaf
2023-12-12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-cl...Lain Soykaf
2023-12-12Merge branch 'fix-dockerfile' into 'develop'lain
2023-12-12Dockerfile: Use platform libvips.Lain Soykaf
2023-12-12Exiftool.ReadDescription: Remove wrong spec.Lain Soykaf
2023-12-12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-cl...Lain Soykaf
2023-12-12Merge branch 'build-releases-with-provided-libvips-2' into 'develop'lain
2023-12-12Mix: Update vix.Lain Soykaf
2023-12-11Merge branch 'build-releases-with-provided-libvips-2' into 'develop'lain