summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 'fix/race-in-tests' into 'develop'kaniini
Fix a race condition in tests See merge request pleroma/pleroma!1673
2019-09-16Fix a race condition in testsEgor Kislitsyn
2019-09-16Restore tests for `change_password` and `delete_account`Egor Kislitsyn
2019-09-16Merge branch 'develop' into issue/733Maksim Pechnikov
2019-09-15Merge branch '1149-oban-job-queue' into 'develop'rinpatch
[#1149] `oban`-based job & retry queues Closes #1149 See merge request pleroma/pleroma!1518
2019-09-15[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex # lib/pleroma/web/router.ex
2019-09-15[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).Ivan Tashkinov
2019-09-15added prepare html for RichMedia.ParserMaksim Pechnikov
2019-09-15Merge branch 'develop' into support/testsMaksim Pechnikov
2019-09-15[#1149] Reinstated docs/config.md changes.Ivan Tashkinov
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-14Merge branch 'develop' into refactor/subscriptionRoman Chvanikov
2019-09-14[#1149] Rewritten readme as config/description.exs.Ivan Tashkinov
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-14Merge branch 'fix-tests' into 'develop'rinpatch
Fix `Activity.all_by_actor_and_id/2` test See merge request pleroma/pleroma!1668
2019-09-14Fix `Activity.all_by_actor_and_id/2` testEgor Kislitsyn
2019-09-14Merge branch 'security/fav-reblog-access-control' into 'develop'rinpatch
Mastodon API: Respect post privacy in favourited/reblogged endpoints See merge request pleroma/pleroma!1667
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsrinpatch
2019-09-14Mastodon API: Respect post privacy in favourited/reblogged endpointsrinpatch
2019-09-13Merge branch 'capture-test-errors' into 'develop'lain
Capture test error messages where appropriate See merge request pleroma/pleroma!1665
2019-09-13Merge branch 'refactor/add_link_headers' into 'develop'lain
Refactor `add_link_headers/7` -> `add_link_headers/3` See merge request pleroma/pleroma!1636
2019-09-13Merge branch 'develop' into feature/delivery-trackingrinpatch
2019-09-13Disallow NULLs in deliveriesrinpatch
2019-09-13don't track generated_config.mdAlex S
2019-09-13config.md backAlex S
2019-09-13markdown generation to the new fileAlex S
2019-09-13Capture test error messages where appropriatestwf
2019-09-13Separate Subscription Notifications from regular NotificationsRoman Chvanikov
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Apply suggestion to lib/pleroma/delivery.exrinpatch
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Merge branch 'cleanup-activity' into 'develop'lain
Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623
2019-09-13Merge branch 'feature/change-email' into 'develop'Haelwenn
Add email change endpoint Closes #1156 See merge request pleroma/pleroma!1580
2019-09-13Merge branch 'admin-config-description' into 'develop'rinpatch
Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611
2019-09-13fix formattingMaksim Pechnikov
2019-09-13fix testsMaksim Pechnikov
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.exrinpatch
2019-09-13Remove unused functions and fix credo issuesrinpatch
2019-09-13Use delivery info when federating deletesrinpatch
2019-09-13Add a note about compatibility with MastodonEgor Kislitsyn
2019-09-13Add email change endpointEgor Kislitsyn
2019-09-13Add more tests for Pleroma.ActivityEgor Kislitsyn
2019-09-13Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.UtilsEgor Kislitsyn
2019-09-13fix Activity.get_by_idMaksim Pechnikov
2019-09-13Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exsMaksim
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-20 22:52:28 +0000