summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-09-19Merge branch 'outbox_pagination' into 'develop'lain
Fix AP outbox pagination See merge request pleroma/pleroma!1700
2019-09-19Fix pagination in AP outbox.jsonD Anzorge
2019-09-19Mastodon API: Return `pleroma.direct_conversation_id` when creating direct ↵eugenijm
messages (`POST /api/v1/statuses`)
2019-09-18Merge branch 'issue/733' into 'develop'Haelwenn
[#733] added test for Ostatus See merge request pleroma/pleroma!1657
2019-09-18Merge branch 'chores/bump-copyright-year' into 'develop'rinpatch
Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698
2019-09-18Bump copyright years of files changed in 2019Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2019-09-18Merge branch 'hide-follower-following-count' into 'develop'feld
Add a setting to hide follows/followers stats from the user profile See merge request pleroma/pleroma!1663
2019-09-18Merge branch 'admin_api_invite_tokens' into 'develop'feld
POST for creating invite tokens in admin api See merge request pleroma/pleroma!1637
2019-09-18Merge branch 'feature/poll-refresh' into 'develop'Haelwenn
Poll refetching See merge request pleroma/pleroma!1694
2019-09-18Fix credo issuesrinpatch
2019-09-18Do not refetch local objectsrinpatch
2019-09-18Preserve internal fields when reinjectingrinpatch
2019-09-18Move object internal fields to a constantrinpatch
2019-09-18Set updated_at even if the object stayed the samerinpatch
2019-09-18Fix wrong argument order when calling NaiveDateTime.diffrinpatch
2019-09-18Initial poll refresh supportrinpatch
Implement refreshing the object with an interval and call the function when getting the poll.
2019-09-18namingsAlex S
2019-09-18little fixesAlex S
2019-09-18post for creating invite tokens in admin apiAlex S
2019-09-17markdown.ex: put two-spaces before the description-newlineHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: end suggestions list with a newlineHaelwenn (lanodan) Monnier
Otherwise we end up with suggestion on the same level as the childs Markdown is a fuck…
2019-09-17markdown.ex: \n\n on >1 suggestions, 2-spaces on oneHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: Make suggestion(s) plural only if on >1Haelwenn (lanodan) Monnier
2019-09-17description.exs: remove empty strings on descriptionsHaelwenn (lanodan) Monnier
2019-09-17markdown.ex: do not fail if there is no childrenHaelwenn (lanodan) Monnier
2019-09-17docs/markdown.ex: do no print empty suggestionsHaelwenn (lanodan) Monnier
2019-09-17docs/markdown.ex: child header as "- key (type): description"Haelwenn (lanodan) Monnier
2019-09-17Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-17Merge branch 'feature/return-total-for-reports' into 'develop'rinpatch
Admin API: Return total for reports See merge request pleroma/pleroma!1628
2019-09-17Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-17Fix notification warningsSteven Fuchs
2019-09-17Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'Haelwenn
Fix `Transmogrifier.upgrade_user_from_ap_id/1` See merge request pleroma/pleroma!1677
2019-09-17Merge branch 'support/tests' into 'develop'rinpatch
add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627
2019-09-17remove remaining errors from testsSteven Fuchs
2019-09-17Mastodon API: Add a setting to hide follow/follower count from the user view ↵eugenijm
(`hide_follows_count` and `hide_followers_count`)
2019-09-17Update oban to 0.8.1rinpatch
This version uses a different locking mechanism, which gets rid of `WARNING: you don't own a lock of type ShareLock` log spam
2019-09-16Fix `Transmogrifier.upgrade_user_from_ap_id/1`Egor Kislitsyn
2019-09-16Merge branch 'develop' into feature/return-total-for-reportsMaxim Filippov
2019-09-16Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-09-16Revert "Merge branch 'streamer-refactoring' into 'develop'"kaniini
This reverts merge request !1653
2019-09-16Streamer refactoringSteven Fuchs
2019-09-16Merge branch 'feature/delivery-tracking' into 'develop'kaniini
Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661
2019-09-16Merge branch 'feature/optimize_rich_media_parser' into 'develop'kaniini
added prepare html for RichMedia.Parser See merge request pleroma/pleroma!1672
2019-09-16Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-15added prepare html for RichMedia.ParserMaksim Pechnikov
2019-09-15Merge branch 'develop' into support/testsMaksim Pechnikov
2019-09-15[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md
2019-09-14Merge branch 'config-changes' into 'develop'rinpatch
two separate files for config.md and generated config.md See merge request pleroma/pleroma!1666
2019-09-14Merge branch 'fix/truncate-remote-user-fields' into 'develop'rinpatch
Truncate remote user fields See merge request pleroma/pleroma!1619
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-04 18:14:30 +0000