summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-16Merge branch 'elixir-1.9' into 'develop'rinpatch
2020-06-16Upgrade to Elixir 1.9Steven Fuchs
2020-06-16Merge branch 'fix/1787-mogrify-args' into 'develop'lain
2020-06-16namingAlexander Strizhakov
2020-06-16fix attemps to merge mapAlexander Strizhakov
2020-06-16fix for updated hackneyAlexander Strizhakov
2020-06-16Mogrify args as custom tuplesAlexander Strizhakov
2020-06-15Merge branch 'merge-ogp-twitter-parsers' into 'develop'lain
2020-06-15Fix testsEgor Kislitsyn
2020-06-15Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-15Merge branch 'notifications-filtering' into 'develop'lain
2020-06-14Mastodon API: ensure the notification endpoint doesn't return less than the r...eugenijm
2020-06-13Merge branch '1851-favorites-pagination' into 'develop'rinpatch
2020-06-13ControllerHelper: Always return id field.lain
2020-06-13Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-13Remove use of atoms in MRF.UserAllowListPolicyhref
2020-06-13Fix atom leak in Rich Media ParserEgor Kislitsyn
2020-06-12Merge branch 'patch-1' into 'develop'Haelwenn
2020-06-12Merge branch 'recipients-experiments' into 'develop'Haelwenn
2020-06-12Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2Egor Kislitsyn
2020-06-12Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-12Merge branch 'global-status-expiration' into 'develop'lain
2020-06-12Apply suggestion to config/description.exslain
2020-06-12Merge branch 'features/mix-task-reset-mfa' into 'develop'feld
2020-06-12Merge branch 'chore/bump-changelog' into 'develop'feld
2020-06-12Document new mix task feature to reset mfaMark Felder
2020-06-12Merge branch 'develop' into features/mix-task-reset-mfaMark Felder
2020-06-12Add changelog entry for emoji pack reload commandMark Felder
2020-06-12Merge branch 'feature/cli-reload-emoji' into 'develop'lain
2020-06-12Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'feld
2020-06-12[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov
2020-06-12Update pleroma.nginx to support TLSv1.3normandy
2020-06-11New mix task: pleroma.user reset_mfa <nickname>Haelwenn (lanodan) Monnier
2020-06-11Deprecate Pleroma.Web.RichMedia.Parsers.OGPEgor Kislitsyn
2020-06-11Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'feld
2020-06-11Check for media proxy base_url, not Upload base_urlMark Felder
2020-06-11Merge branch 'develop' into fix/csp-mediaproxy-base-urlMark Felder
2020-06-11Merge branch '1794-hashtags-construction-from-uri' into 'develop'feld
2020-06-11Merge OGP parser with TwitterCardEgor Kislitsyn
2020-06-11[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Add command to reload emoji packs from cli for OTP usersMark Felder
2020-06-10HTTP security plug: add media proxy base url host to csprinpatch
2020-06-10ActivityPubTest: Update test for atomized parameters.lain
2020-06-10Add testThibaut Girka
2020-06-10Merge branch 'remake-remodel-dms' into 'develop'rinpatch
2020-06-10ActivityPubTest: Make test easier to understand.lain
2020-06-10ActivityPub: Don't show announces of your own objects in timeline.lain
2020-06-10ControllerHelper: Fix wrong comparison.lain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 14:51:44 +0000