summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-20Merge branch 'private-pins' into 'develop'Alex Gleason
Support private pinned posts from Mastodon See merge request pleroma/pleroma!3611
2022-01-20Merge branch 'from/develop/tusooa/add-glitch-lily' into 'develop'Alex Gleason
Add glitch-lily to clients.md See merge request pleroma/pleroma!3610
2022-01-20Test pinned private statuses in AccountControllerAlex Gleason
2022-01-20Support private pinned posts from Mastodonmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-19Add glitch-lily to clients.mdTusooa Zhu
2022-01-20Merge branch 'feat/force-mentions-mrf' into 'develop'rinpatch
Add ForceMentionsInContentPolicy See merge request pleroma/pleroma!3609
2022-01-19Update changelogmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-19Add ForceMentionsInContentPolicyrinpatch
Even though latest PleromaFE supports displaying these properly, mobile apps still exist, so I think we should offer a workaround to those who want it.
2022-01-19check if remote bday is validmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18Birth dates: Add testsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18Format code, expose instance configuration related to birth datesmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18Merge branch 'document-oauth-tokens' into 'develop'Alex Gleason
Docs: PleromaAPI oauth_tokens endpoints See merge request pleroma/pleroma!3607
2022-01-18Docs: PleromaAPI oauth_tokens endpointsAlex Gleason
2022-01-18Merge branch 'erratic-allow-failure' into 'develop'Alex Gleason
unit-testing-erratic: allow failure See merge request pleroma/pleroma!3606
2022-01-18Birth dates, birthday reminders API, allow instance admins to require ↵marcin mikołajczak
minimum age Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18Merge branch 'hakabahitoyo-develop-patch-44025' into 'develop'Alex Gleason
[Document] Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`. See merge request pleroma/pleroma!3604
2022-01-15unit-testing-erratic: allow failureAlex Gleason
2022-01-15Merge branch 'linkify-0.5.2' into 'develop'Alex Gleason
Upgrade Linkify to v0.5.2 Closes #2376, #2386, and #2485 See merge request pleroma/pleroma!3605
2022-01-15mix formatAlex Gleason
2022-01-15CHANGELOG: hashtags markdown fixAlex Gleason
2022-01-15FormatterTest: fix nesting in expected outputAlex Gleason
2022-01-15Merge remote-tracking branch 'mkfain/test-for-breaking-markdown' into ↵Alex Gleason
linkify-0.5.2
2022-01-15Upgrade Linkify to v0.5.2Alex Gleason
2022-01-15Update cheatsheet.md. Add `Pleroma.Web.ActivityPub.MRF.KeywordPolicy`.Hakaba Hitoyo
2022-01-14Merge branch 'show_blockers_visible' into 'develop'Alex Gleason
Add blockers_visible to features list when it's enabled See merge request pleroma/pleroma!3603
2022-01-14Add blockers_visible to features list when it's enabledNEETzsche
2022-01-14Merge branch 'mergeback' into 'develop'rinpatch
Merge stable back into develop Closes #2753 See merge request pleroma/pleroma!3602
2022-01-14Merge remote-tracking branch 'origin/stable' into mergebackAlex Gleason
2022-01-13Merge branch 'account-endorsements' into 'develop'Alex Gleason
Account endorsements See merge request pleroma/pleroma!3601
2022-01-12Add more testsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12WIP account endorsementsmarcin mikołajczak
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-11Merge branch 'release/2.4.2' into 'stable'rinpatch
2.4.2 Release See merge request pleroma/pleroma!3599
2022-01-11CI: Conservatively update release images so they keep building.Lain Soykaf
2022-01-11CI: Upload the image for all platformsLain Soykaf
For some reason the other platforms started failing, too. This fixes it. Why? Don't know.
2022-01-11Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdfrinpatch
2022-01-11mix.lock: sync with mix.exsrinpatch
hackney version was bumped in mix.exs, but mix.lock was not updated
2022-01-11Add 2.4.2 changelog entry and bump mix versionrinpatch
2022-01-11Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'Alex Gleason
Escape unicode RTL overrides in rich media parser tests See merge request pleroma/pleroma!3598
2022-01-11Merge branch 'pleroma-result-1_13' into 'develop'lain
move result into with guard See merge request pleroma/pleroma!3557
2022-01-10Merge remote-tracking branch 'origin/develop' into account-endorsementsmarcin mikołajczak
2022-01-10Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'Alex Gleason
Escape unicode RTL overrides in rich media parser tests See merge request pleroma/pleroma!3598
2022-01-10Escape unicode RTL overrides in rich media parser testsrinpatch
Elixir 1.13 does not allow them in raw form anymore, resulting in errors like this when running the test: == Compilation error in file test/pleroma/web/rich_media/parser_test.exs == ** (SyntaxError) test/pleroma/web/rich_media/parser_test.exs:136:45: invalid bidirectional formatting character in string: \u202C. If you want to use such character, use it in its escaped \u202C form instead
2022-01-10Merge branch 'update-hackney' into 'develop'lain
Mix: upgrade Hackney to 1.18.0 Closes #2753 See merge request pleroma/pleroma!3549
2022-01-07Merge branch 'api-docs-fixes' into 'develop'Alex Gleason
Docs: fix various Pleroma API endpoints paths, fix MFA response See merge request pleroma/pleroma!3596
2022-01-07Docs: fix various Pleroma API endpoints paths, fix MFA responseAlex Gleason
2022-01-02Merge branch 'change/web-push-encryption-dep' into 'develop'Alex Gleason
Upgrade web_push_encryption to 0.3.1 See merge request pleroma/pleroma!3592
2022-01-01Upgrade web_push_encryption to 0.3.1Sean King
2022-01-01Merge branch 'change/concurrent-limiter-dep' into 'develop'Alex Gleason
Change concurrent_limiter to version 0.1.1 See merge request pleroma/pleroma!3591
2022-01-01Change concurrent_limiter to Hex PM version 0.1.1Sean King
2021-12-31Merge branch 'erratic-streamer-test' into 'develop'Alex Gleason
StreamerTest: tag erratic test See merge request pleroma/pleroma!3590
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 14:10:17 +0000