aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
AgeCommit message (Collapse)Author
2019-05-13user: migrate follow/blocks import to job queueWilliam Pitcock
2019-05-13user: move initial post fetching to job queueWilliam Pitcock
2019-05-13differences_in_mastoapi_responses.md: fullname & bio are optionnalAlexander Strizhakov
[ci skip]
2019-05-11Merge developRoman Chvanikov
2019-05-08Merge developAlexander Strizhakov
Merge conflict in lib/pleroma/activity.ex
2019-05-08Merge developRoman Chvanikov
2019-05-07Remove bookmarks assocrinpatch
2019-05-07Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Alexander Strizhakov
feature/845-improve-status-deletion
2019-05-03Pleroma.User: remove emojify on parse_bioHaelwenn (lanodan) Monnier
2019-05-01test fixesAlex S
2019-05-01Merging with developAlex S
Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex
2019-04-30Merge developRoman Chvanikov
2019-04-25migration without using old field nameAlex S
removing old field from db, after bookmarks migration
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
This reverts commit 16d8c8b33b654b88e5e934832d5e26eb7152633e. Because it breaks everything
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
deliver_async will return a single atom
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029
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
Notification controls Closes #738 See merge request pleroma/pleroma!988
2019-04-09Merge branch 'bugfix/follower_count' into 'develop'lambda
update the follower count when a follower is blocked See merge request pleroma/pleroma!1033
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
Added in pleroma extensions, but can be moved whenever
2019-04-05Make subscriptions the same direction as blocksSadposter
That being, user - subscribes to -> users, rather than user - has subscribers -> users
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 ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-04-02Merge branch 'remove-user-activities' into 'develop'lambda
[#757] Add mix task to delete user's activities See merge request pleroma/pleroma!1008
2019-04-02Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
# Conflicts: # lib/pleroma/web/oauth/oauth_controller.ex # lib/pleroma/web/router.ex
2019-04-02change `Repo.get(User, id)` => `User.get_by_id(id)`Egor Kislitsyn
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 04:35:32 +0000