aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-04-17Merge branch 'feature/1584-client-captcha-options' into 'develop'Haelwenn
Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252
2020-04-17Merge branch 'fix/1694-transfer-task-fix' into 'develop'Haelwenn
Fix for logger configuration Closes #1694 See merge request pleroma/pleroma!2396
2020-04-17Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'Haelwenn
Added need_reboot endpoint to admin api Closes #1677 See merge request pleroma/pleroma!2373
2020-04-17fix for logger configurationAlexander Strizhakov
2020-04-16Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349
2020-04-16Merge branch 'fix/1691-feed-render' into 'develop'rinpatch
Fix for use of `published` field from different entities Closes #1691 See merge request pleroma/pleroma!2395
2020-04-16Merge branch 'develop' into features/remove-user-source_datarinpatch
2020-04-16fix for use of published from different entitiesAlexander Strizhakov
2020-04-16Merge branch 'refactor/remove-upgrade-changeset' into 'develop'rinpatch
Remove User.upgrade_changeset in favor of remote_user_creation See merge request pleroma/pleroma!2368
2020-04-16added need_reboot endpoint to admin apiAlexander Strizhakov
2020-04-15Cleanup SubscriptionControllerEgor Kislitsyn
2020-04-15[#2349] Made :skip_plug/2 prevent plug from being executed even if ↵Ivan Tashkinov
explicitly called. Refactoring. Tests.
2020-04-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
authenticated-api-oauth-check-enforcement
2020-04-15remote_ip plug adds remote_ip_found flagAlexander Strizhakov
2020-04-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/notification.ex
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
This reverts merge request !1877
2020-04-14Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-14Merge branch 'logger-configuration' into 'develop'feld
Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365
2020-04-14Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/notification.ex
2020-04-14Merge branch 'issue/1276' into 'develop'Haelwenn
[#1276] An endpoint for getting unread notification count Closes #1276 See merge request pleroma/pleroma!1877
2020-04-13Add OpenAPI spec for DomainBlockControllerEgor Kislitsyn
2020-04-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-13Add OpenAPI spec for CustomEmojiControllerEgor Kislitsyn
2020-04-13Add specs for AccountController.mutes, AccountController.blocks, ↵Egor Kislitsyn
AccountController.mutes, AccountController.endorsements
2020-04-13Add spec for AccountController.followsEgor Kislitsyn
2020-04-13Add specs for AccountController.block and AccountController.unblockEgor Kislitsyn
2020-04-13Add specs for AccountController.mute and AccountController.unmuteEgor Kislitsyn
2020-04-13Add spec for AccountController.unfollowEgor Kislitsyn
2020-04-13Add spec for AccountController.followEgor Kislitsyn
2020-04-13Add spec for AccountController.listsEgor Kislitsyn
2020-04-13Add spec for AccountController.followingEgor Kislitsyn
2020-04-13Add spec for AccountController.followersEgor Kislitsyn
2020-04-13Add spec for AccountController.statusesEgor Kislitsyn
2020-04-13Add spec for AccountController.showEgor Kislitsyn
2020-04-13Add spec for AccountController.relationshipsEgor Kislitsyn
2020-04-13Add specs for ActorType and VisibilityScopeEgor Kislitsyn
2020-04-13Add spec for AccountController.update_credentialsEgor Kislitsyn
2020-04-13Add spec for AccountController.verify_credentialsEgor Kislitsyn
2020-04-13Add spec for AccountController.createEgor Kislitsyn
2020-04-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/following_relationship.ex
2020-04-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
output-of-relationships-in-statuses
2020-04-13fix for logger configuration through admin-feAlexander Strizhakov
2020-04-13fix mediaType of objectMaksim Pechnikov
2020-04-12Always accept deletions through SimplePolicyAlex Gleason
2020-04-12[#1364] Enabled notifications on followed domain-blocked users' activities.Ivan Tashkinov
2020-04-11Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332
2020-04-11Remove User.upgrade_changeset in favor of remote_user_creationrinpatch
The two changesets had the same purpose, yet some changes were updated in one, but not the other (`uri`, for example). Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from `ActivityPub.make_user_from_ap_id` only when the user is actually not AP enabled yet. I did not bother rewriting tests that used `User.insert_or_update` to use the changeset instead because they seemed to just test the implementation, rather than behavior.
2020-04-11[#1364] Disabled notifications on activities from blocked domains.Ivan Tashkinov
2020-04-10Merge branch 'develop' into fix/support-conversations-paginationEgor Kislitsyn
2020-04-10Merge branch 'bugfix/apc2s_upload_activity' into 'develop'Haelwenn
bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316