aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
AgeCommit message (Expand)Author
2019-12-10Apply suggestion to lib/pleroma/user.exSadposter
2019-12-10Merge branch 'develop' into 'domain-block-precedence'Sadposter
2019-12-10modify SQL to include followed-but-domain-blocked activitiesSadposter
2019-12-10Merge branch 'develop' into '1427-oauth-admin-scopes'lain
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-10Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin...Ivan Tashkinov
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-07[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.Ivan Tashkinov
2019-12-06Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-s...Ivan Tashkinov
2019-12-06[#1427] Reworked admin scopes support.Ivan Tashkinov
2019-12-05Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-04[#1335] Merge issue fix.Ivan Tashkinov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-28added User.NotificationSetting structMaksim Pechnikov
2019-11-28obligatory format commitSadposter
2019-11-28make follows take precedence over domain blocksSadposter
2019-11-27Remove User.user_info/2Egor Kislitsyn
2019-11-26Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-23Removed users.info and remaining usages.Ivan Tashkinov
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
2019-11-22Swap map with eachMaxim Filippov
2019-11-21Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-21Merge branch 'issue/1348' into 'develop'lain
2019-11-21Fix user.following_countEgor Kislitsyn
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for Us...Ivan Tashkinov
2019-11-20[#1335] User AP ID relations fetching performance optimizations.Ivan Tashkinov
2019-11-19[#1335] Implemented notification mutes and reblog mutes as UserRelationships....Ivan Tashkinov
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-18[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced E...Ivan Tashkinov
2019-11-15Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
2019-11-14Merge remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
2019-11-12Add `allow_following_move` setting to UserEgor Kislitsyn
2019-11-11User: Don't let deactivated users authenticate.lain
2019-11-11[#1335] Applied code review suggestions.Ivan Tashkinov
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
2019-11-04excluded invisible actors from gets /api/v1/accounts/:idMaksim Pechnikov
2019-11-04User: Don't pull remote users follower count immediately after deactivating.lain
2019-10-28Merge branch 'develop' into feature/move-activityEgor Kislitsyn
2019-10-28Merge branch 'refactor/following-relationships' into 'develop'lain
2019-10-26Mark the conversations with the blocked user as read and update the blocking ...eugenijm
2019-10-25Add `also_known_as` field to Pleroma.UserEgor Kislitsyn
2019-10-25Remove unused Pleroma.User.info_fields/0Egor Kislitsyn
2019-10-24Merge remote-tracking branch 'upstream/develop' into refactor/following-relat...Egor Kislitsyn
2019-10-23[#1304] Fixed null::jsonb handling in User.Info migration.Ivan Tashkinov
2019-10-21[#1304] Merged `develop`, handled User.Info.invisible.Ivan Tashkinov
2019-10-21Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-d...Ivan Tashkinov