aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
AgeCommit message (Expand)Author
2020-06-08Merge branch 'recipients-query-speedup' into 'develop'rinpatch
2020-05-13User: Truncate bios when updating a remote user.lain
2020-05-02Merge branch '1559-follow-request-notifications' into 'develop'rinpatch
2020-05-01Merge branch 'following-relationships-optimizations' into 'develop'rinpatch
2020-05-01Deactivate local users on deletion instead of deleting the recordrinpatch
2020-04-08Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
2020-04-02Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
2020-03-31Merge branch 'admin-api-change-password' into 'develop'lain
2020-03-31Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
2020-03-16rip out fetch_initial_postsrinpatch
2020-03-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
2020-03-15Merge branch 'fix/signup-without-email' into 'develop'feld
2020-03-02Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
2020-03-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-02-25Fix Dialyzer warningsEgor Kislitsyn
2020-02-07Add User.get_follow_state/2Egor Kislitsyn
2020-02-05Add support for cancellation of a follow requestEgor Kislitsyn
2020-01-28update ectoMaksim Pechnikov
2020-01-17updated error messages for authentication processMaksim Pechnikov
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-s...Ivan Tashkinov
2020-01-10Merge branch 'issue/1490' into 'develop'lain
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, mig...Ivan Tashkinov
2020-01-08fix create service actorMaksim Pechnikov
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: co...Ivan Tashkinov
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