aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2019-09-17remove remaining errors from testsSteven Fuchs
2019-09-17Move pleroma_api controllers into controllers sub-foldersRoman Chvanikov
2019-09-17Rename SubscriptionNotificationController list and get actions to index and showRoman Chvanikov
2019-09-17Apply suggestion to ↵Roman Chvanikov
test/web/pleroma_api/subscription_notification_controller_test.exs
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-16Move subscription notifications to a separate controllerRoman Chvanikov
2019-09-16Merge developRoman Chvanikov
2019-09-16Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
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-16Fix signed fetch inclusion publisher testrinpatch
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
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-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-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-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 '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] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-14Fix `Activity.all_by_actor_and_id/2` testEgor Kislitsyn
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 'develop' into feature/delivery-trackingrinpatch
2019-09-13Capture test error messages where appropriatestwf
2019-09-13Separate Subscription Notifications from regular NotificationsRoman Chvanikov
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 remote-tracking branch 'origin/develop' into reactionslain
2019-09-13ActivityPub: Use is_unicode_emoji? function.lain
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-13Remove unused functions and fix credo issuesrinpatch
2019-09-13Use delivery info when federating deletesrinpatch
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
2019-09-13Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-13Emoji: Add function to detect if a character is an emojilain
2019-09-12Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-12Track object/create activity fetchesrinpatch