summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/views/account_view_test.exs
AgeCommit message (Collapse)Author
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-05Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28added User.NotificationSetting structMaksim Pechnikov
2019-11-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
bugfix/1442-dont-return-nil-for-following-count
2019-11-27Remove User.user_info/2Egor Kislitsyn
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵Ivan Tashkinov
UserRelationship-related functionality.
2019-11-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
2019-11-12Add `allow_following_move` setting to UserEgor Kislitsyn
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
Introduced UserBlock.
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-17Mastodon API: Mark the conversation as read for the author when they send a ↵eugenijm
new direct message
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
This reverts merge request !1737
2019-10-04Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-09-30Fix mergeEgor Kislitsyn
2019-09-27mastodon api: implement follow_requests_countAriadne Conill
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
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-17Mastodon API: Add a setting to hide follow/follower count from the user view ↵eugenijm
(`hide_follows_count` and `hide_followers_count`)
2019-08-26Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers ↵Egor Kislitsyn
and test/web/mastodon_api/views