summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-13Use the "change" typeMark Felder
2023-11-13Switch to PromEx for prometheus metricsMark Felder
Recommending use of the separate HTTP server for exposing the metrics and securing it externally on your firewall or reverse proxy. It will listen on port 4021 by default.
2023-11-13Fix GenerateUnsetUserKeys migrationmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-11-12Merge branch 'quotes-count' into 'develop'lain
Count and display post quotes See merge request pleroma/pleroma!3956
2023-11-12Count and display post quotesmarcin mikołajczak
2023-11-12Merge branch 'phoenix1.7' into 'develop'lain
Update to Phoenix 1.7 See merge request pleroma/pleroma!3900
2023-11-12Merge branch 'meilisearch' into 'develop'lain
Different search backends, in particular meilisearch as an additional one See merge request pleroma/pleroma!3529
2023-11-12Credo fixes.Lain Soykaf
2023-11-12B Meilisearch: Update to current API responses.Lain Soykaf
2023-11-12B DatabaseSearch: Fix local-only search.Lain Soykaf
2023-11-12Fix most tests that call SearchIndexWorker.Lain Soykaf
2023-11-12Add changelog.Lain Soykaf
2023-11-12B MeiliSearch, SearchIndexingWorker: Use Config.Getting, make tests async.Lain Soykaf
2023-11-12B Getting: Add default implementation, delegate, prepare test support.Lain Soykaf
2023-11-12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Lain Soykaf
pleroma-meilisearch
2023-11-10Initial draft on frontends managementHenry Jameson
2023-11-08Merge branch 'benchee' into 'develop'feld
Ensure benchee doesn't run unless we are executing benchmarks See merge request pleroma/pleroma!3972
2023-11-08Ensure benchee doesn't run unless we are executing benchmarksMark Felder
2023-11-08Fix changelogd grep syntax errorMark Felder
2023-11-08Merge branch 'changelogd-fix' into 'develop'feld
Fix changelogd grep syntax error See merge request pleroma/pleroma!3973
2023-11-08Fix changelogd grep syntax errorMark Felder
2023-11-08Merge branch 'update_mr_template' into 'develop'feld
Update MR template to include the type 'change' See merge request pleroma/pleroma!3971
2023-11-08Update MR template to include the type 'change'Mark Felder
2023-11-08Merge branch 'develop' into phoenix1.7Mark Felder
2023-11-08Merge branch 'bare_uri_test' into 'develop'feld
Activate test for object validator that has not been running See merge request pleroma/pleroma!3968
2023-11-08Merge branch 'changelogd-change' into 'develop'feld
changelogd: Support a type called "change" See merge request pleroma/pleroma!3970
2023-11-08Support a type called "change"Mark Felder
2023-11-08ObjectValidators.BareUriTest: Replace calls of SafeText to BareUriHaelwenn (lanodan) Monnier
2023-11-07Phoenix is no longer required in extra_applicationsMark Felder
2023-11-07Merge branch 'develop' into phoenix1.7Mark Felder
2023-11-07Activate test for object validator that has not been runningMark Felder
2023-11-07Merge branch 'mailer-queue' into 'develop'feld
Fix digest email processing, consolidate Oban queues See merge request pleroma/pleroma!3966
2023-11-07Fix digest email processing, consolidate Oban queuesMark Felder
The email related jobs can all share a single Oban queue
2023-11-01Merge branch 'mergeback/2.6.0' into 'develop'tusooa
mergeback: 2.6.0 Closes #3135 See merge request pleroma/pleroma!3964
2023-10-31Bump package version for mergebacktusooa
2023-11-01Merge branch 'release/2.6.0' into 'stable'tusooa
Release/2.6.0 See merge request pleroma/pleroma!3924
2023-10-31Merge branch 'stable' into 'release/2.6.0'tusooa
# Conflicts: # .gitlab-ci.yml # lib/pleroma/web/common_api/utils.ex # lib/pleroma/web/xml.ex # mix.exs # test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs # test/pleroma/web/common_api/utils_test.exs # test/pleroma/web/mastodon_api/update_credentials_test.exs # test/pleroma/web/xml_test.exs
2023-10-29Bundle 2.6.0 frontendtusooa
2023-10-25Add collect-changelog scripttusooa
2023-10-24Bump version to 2.6.0tusooa
2023-10-18Merge branch 'tusooa/2810-punycode-mention' into 'develop'Haelwenn
Fix mentioning punycode domains when using Markdown Closes #2810 See merge request pleroma/pleroma!3925
2023-10-16Fix other quotation mark conversion teststusooa
2023-10-16Fix mentioning punycode domains when using Markdowntusooa
2023-10-15Merge branch 'tusooa/3018-unified-stream' into 'develop'tusooa
Unified streaming endpoint Closes #3018 See merge request pleroma/pleroma!3864
2023-10-15Explain the encode-decode roundtriptusooa
2023-10-15Add changelogtusooa
2023-10-15Fix duplicated schema namestusooa
2023-10-15Fix unsubscribe event type in streaming doctusooa
2023-10-15Add meta-info and query strings to streaming doctusooa
2023-10-15Fix some specs about server-sent events in streamingtusooa