aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
AgeCommit message (Expand)Author
2019-07-20Resolve merge conflictsrinpatch
2019-07-20Apply suggestion to lib/pleroma/user.exrinpatch
2019-07-20Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-07-20[#1112] Preserving `id` on user insert conflict on order not to violate conve...Ivan Tashkinov
2019-07-20Merge developRoman Chvanikov
2019-07-17user: add is_internal_user? helper functionAriadne Conill
2019-07-17user: refactor get_or_create_instance_user() into get_or_create_service_actor...Ariadne Conill
2019-07-16Merge developRoman Chvanikov
2019-07-15tests for Pleroma.SignatureMaksim
2019-07-14Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-07-14Feature/1072 muting notificationsAlexander Strizhakov
2019-07-14Add follow information refetching after following/unfollowingrinpatch
2019-07-13Refactor Follows/Followers counter syncronizationrinpatch
2019-07-12merge developRoman Chvanikov
2019-07-10removing synchronization workerAlex S
2019-07-10adding following_address field to userAlex S
2019-07-10Send and handle "Delete" activity for deleted usersSergey Suprunenko
2019-07-09Merge developRoman Chvanikov
2019-07-09Fix/1019 correct count remote usersAlexander Strizhakov
2019-07-05[#1043] fix search accounts.Maksim
2019-06-29Resolve conflictsRoman Chvanikov
2019-06-24[#184] small refactoring reset passwordMaksim
2019-06-24Rework user deletionSergey Suprunenko
2019-06-14it is changed in compile timeAlexander Strizhakov
2019-06-07Resolve conflictsRoman Chvanikov
2019-06-05Merge branch 'bugfix/377-stuck-follow-request' into 'develop'kaniini
2019-06-05Merge branch 'improve-search' into 'develop'kaniini
2019-06-05User: Remove superfluous `maybe_follow`.lain
2019-06-05Typo + Linting.lain
2019-06-05User: Don't error out when following a user that's already followed.lain
2019-06-05Fix formattingEgor Kislitsyn
2019-06-05Limit search for unauthenticated users to local users onlyEgor Kislitsyn
2019-06-03Merge branch 'develop' into feature/digest-emailMark Felder
2019-06-03User: Add function to get AP ids from nicknames.lain
2019-06-01Merge remote-tracking branch 'upstream/develop' into admin-create-usersSachin Joshi
2019-06-01make bulk user creation from admin works as a transactionSachin Joshi
2019-05-31Mastodon API search default value for "resolve" is falsefeld
2019-05-30Use Pleroma.Config everywhereEgor Kislitsyn
2019-05-29Merge developRoman Chvanikov
2019-05-22move key generation functions into Pleroma.Keys moduleWilliam Pitcock
2019-05-20Move default mascot configuration to `config/`Sadposter
2019-05-17Fix specs.lain
2019-05-17Fix/902 random compile failingAlexander Strizhakov
2019-05-16Remove duplicated entries in users' following listsSergey Suprunenko
2019-05-16Feature/896 toggling confirmationAlexander Strizhakov
2019-05-14Group def perform() together to fix the buildMark Felder
2019-05-14Merge branch 'refactor/use-job-queue-everywhere' into 'develop'lambda
2019-05-14clean up follow/block imports a littleWilliam Pitcock
2019-05-14Reuse query from User.restrict_deactivated/1Egor Kislitsyn
2019-05-14Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn