aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
AgeCommit message (Expand)Author
2019-04-25Merge branch 'develop' into feature/disable-accountEgor Kislitsyn
2019-04-25migrate user.bookmarks to separate tableAlex S
2019-04-25bookmarks in separate tableAlex S
2019-04-22Use `User.get_cached*` everywhereEgor
2019-04-22Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-20Digest emailsRoman Chvanikov
2019-04-19Fix testsRoman Chvanikov
2019-04-19Add User.list_inactive_users_query/1Roman Chvanikov
2019-04-17Resolve conflictsRoman Chvanikov
2019-04-14Revert "Assert on the success of enqueue before returning"Sadposter
2019-04-14Assert on the success of enqueue before returningSadposter
2019-04-14Always return {atom, _} from try_send_confirmationSadposter
2019-04-14fix pattern match on user registrationSadposter
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
2019-04-12add testsEgor Kislitsyn
2019-04-11fix formatEgor Kislitsyn
2019-04-11move user disable into deactivationEgor Kislitsyn
2019-04-11Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
2019-04-10s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-10Merge branch 'notification-pleroma-settings' into 'develop'kaniini
2019-04-09Merge branch 'bugfix/follower_count' into 'develop'lambda
2019-04-09update the follower count when a follower is blockedSachin Joshi
2019-04-08Used cached user resources in subscriptionsSadposter
2019-04-08Use Pleroma.Config instead of Application.get_envSadposter
2019-04-08Sever subscription in case of blockSadposter
2019-04-05Change relationship direction of subscriptionsSadposter
2019-04-05Add subscribed status to user viewSadposter
2019-04-05Make subscriptions the same direction as blocksSadposter
2019-04-05Add notification checksSadposter
2019-04-05Add API endpoints and user column for subscriptionSadposter
2019-04-04[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_o...Ivan Tashkinov
2019-04-02Merge branch 'remove-user-activities' into 'develop'lambda
2019-04-02Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
2019-04-02change `Repo.get(User, id)` => `User.get_by_id(id)`Egor Kislitsyn
2019-04-02add `user delete_activities` mix taskEgor Kislitsyn
2019-04-02Merge remote-tracking branch 'pleroma/develop' into remove-user-activitiesEgor Kislitsyn
2019-04-01[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_o...Ivan Tashkinov
2019-03-28Add PUT /api/pleroma/notification_settings endpointeugenijm
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov
2019-03-27Merge branch 'feature/more-user-filters' into 'develop'lambda
2019-03-27Add more user filters + move search to its own moduleMaxim Filippov
2019-03-26Merge branch 'fix/ap-icon' into 'develop'lambda
2019-03-26AP UserView: Refactor banner / avatar display code, add test.lain
2019-03-26Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.Ivan Tashkinov
2019-03-25Attempt to fix incorrect federation of default instance avatarsMark Felder
2019-03-23user: use preloads when deleting accountsWilliam Pitcock
2019-03-22Ensure fts is prefered over trigram and use union_all instead of union in use...rinpatch
2019-03-21Move gluing search results from application to database and get mutualsrinpatch