aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-22Copy emoji in the subject from parent postrinpatch
Sometimes people put emoji in the subject, which results in the subject looking broken if someone replies to it from a server that does not have the said emoji under the same shortcode. This patch solves the problem by extending the emoji set available in the summary to that of the parent post.
2021-03-21Merge branch 'fix/2579-finger-content-type' into 'develop'rinpatch
respect content-type header in finger request Closes #2579 See merge request pleroma/pleroma!3375
2021-03-21Merge branch 'richmedia-workaround' into 'develop'rinpatch
Workaround for RichMedia preview image breakage edge case See merge request pleroma/pleroma!3363
2021-03-20Merge branch 'fix/timex-retired-version' into 'develop'feld
updating Timex See merge request pleroma/pleroma!3377
2021-03-20updating timexAlexander Strizhakov
2021-03-19respect content-type header in finger requestAlexander Strizhakov
2021-03-19Merge branch 'mediaproxy-decode' into 'develop'rinpatch
Simple way to decode mediaproxy URLs See merge request pleroma/pleroma!3364
2021-03-19Merge branch 'fix/remove_auto_nsfw' into 'develop'rinpatch
Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223
2021-03-19Merge branch 'bugfix/bridgy-user-icon' into 'develop'rinpatch
Add support for actor icon being a list (Bridgy) See merge request pleroma/pleroma!3372
2021-03-16Merge branch 'update_open_api_spex' into 'develop'Haelwenn
Update OpenApiSpex dependency See merge request pleroma/pleroma!3362
2021-03-15Merge branch 'feature/object-hashtags-rework' into 'develop'rinpatch
Hashtags extraction from objects. Background migration infrastructure. Closes #1840 and #2455 See merge request pleroma/pleroma!3213
2021-03-15OpenAPI: TwitterAPI Util ControllerHaelwenn (lanodan) Monnier
2021-03-15TwitterAPI: Remove unused read notification functionHaelwenn (lanodan) Monnier
2021-03-15Remove deprecated /api/qvitter/statuses/notifications/readHaelwenn (lanodan) Monnier
2021-03-15OpenAPI: PleromaAPI UserImport ControllerHaelwenn (lanodan) Monnier
2021-03-15OpenAPI: MastodonAPI Status ControllerHaelwenn (lanodan) Monnier
2021-03-15OpenAPI: MastodonAPI Account Controller, excluding OAuthHaelwenn (lanodan) Monnier
2021-03-15Verify MastoFE Controller put_settings responseHaelwenn (lanodan) Monnier
2021-03-15OpenAPI: MastodonAPI Conversation ControllerHaelwenn (lanodan) Monnier
2021-03-15OpenAPI: MastodonAPI Media ControllerHaelwenn (lanodan) Monnier
2021-03-15OpenAPI: MastodonAPI Timeline ControllerHaelwenn (lanodan) Monnier
2021-03-15Add support for actor icon being a list (Bridgy)Haelwenn (lanodan) Monnier
2021-03-14Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!3370
2021-03-13Prefer naming this function build_image_url/2Mark Felder
2021-03-13Translated using Weblate (Italian)Ben Is
Currently translated at 100.0% (106 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
2021-03-12[#3213] Code formatting fix.Ivan Tashkinov
2021-03-12[#3213] Background migration infrastructure refactoring.Ivan Tashkinov
Extracted BaseMigrator and BaseMigratorState.
2021-03-12Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-03-11Merge branch 'improve-gitlab-ci' into 'develop'rinpatch
Execute mix deps.get earlier and avoid duplicate invocations if possible See merge request pleroma/pleroma!3369
2021-03-11Execute mix deps.get earlier and avoid duplicate invocations if possibleMark Felder
2021-03-11Leverage function pattern matching insteadMark Felder
2021-03-10Workaround for URI.merge/2 bug ↵Mark Felder
https://github.com/elixir-lang/elixir/issues/10771 If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter. The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL.
2021-03-10Merge branch 'fix/spec-build' into 'develop'feld
Ensure we fetch deps during spec-build stage See merge request pleroma/pleroma!3368
2021-03-10Revert "See if switching to same image as releases fixes the build"Mark Felder
This reverts commit 502d166b7e44e36a94974df4770de6c6a239ad75.
2021-03-10See if switching to same image as releases fixes the buildMark Felder
2021-03-10Ensure we fetch deps during spec-build stageMark Felder
2021-03-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-03-10Merge branch 'openapi/admin/user' into 'develop'Haelwenn
Add OpenAPI spec for AdminAPI.UserController See merge request pleroma/pleroma!3355
2021-03-07Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-03-07[#3213] Performance optimization of filtering by hashtags ("any" condition).Ivan Tashkinov
2021-03-05Make tests use itMark Felder
2021-03-05Add simple way to decode fully qualified mediaproxy URLsMark Felder
2021-03-05Update OpenApiSpex dependencyEgor Kislitsyn
2021-03-04Add UserOperation to RedocEgor Kislitsyn
2021-03-03[#3213] ActivityPub hashtags filtering refactoring. Test fix.Ivan Tashkinov
2021-03-03Merge branch 'mergeback/2.3.0' into 'develop'lain
Mergeback/2.3.0 See merge request pleroma/pleroma!3360
2021-03-03Changelog: Re-add application supportlain
2021-03-03Revert "StatusController: Deactivate application support for now."lain
This reverts commit 024c11c18d289d4acd65d749f939ad3684f31905.
2021-03-03Changelog, mix: merge in stablelain
2021-03-03Merge branch 'fix-migration' into 'develop'Haelwenn
Fix migration in cases where database name has a hyphen See merge request pleroma/pleroma!3359