aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
AgeCommit message (Collapse)Author
2019-10-09Ability to toggle activation status and permission group for a group of usersMaxim Filippov
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"kaniini
This reverts merge request !1737
2019-10-04Merge branch 'user-info-unread-direct-conversation' into 'develop'kaniini
Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737
2019-10-04Fix get_cached_by_nickname_or_id not allowing to get local users byrinpatch
nickname Closes #1293
2019-10-04Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-09-26Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
Simplify updating user's `info` See merge request pleroma/pleroma!1712
2019-09-26Merge branch 'hex-flake-id' into 'develop'kaniini
Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692
2019-09-25Replace `Pleroma.FlakeId` with `flake_id` hex packageEgor Kislitsyn
2019-09-24Cleanup Pleroma.UserEgor Kislitsyn
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-24Do not return tuple when unneededEgor Kislitsyn
2019-09-24Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-23Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-22Admin API: Add ability to force user's password resetMaxim Filippov
2019-09-17Merge branch 'support/tests' into 'develop'rinpatch
add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627
2019-09-16Merge branch 'feature/delivery-tracking' into 'develop'kaniini
Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661
2019-09-15Merge branch 'develop' into support/testsMaksim Pechnikov
2019-09-15[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md
2019-09-14Merge branch 'fix/truncate-remote-user-fields' into 'develop'rinpatch
Truncate remote user fields See merge request pleroma/pleroma!1619
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-13Merge branch 'develop' into feature/delivery-trackingrinpatch
2019-09-13Merge branch 'cleanup-activity' into 'develop'lain
Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623
2019-09-13Use delivery info when federating deletesrinpatch
2019-09-13Add email change endpointEgor Kislitsyn
2019-09-13Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.UtilsEgor Kislitsyn
2019-09-12Track object/create activity fetchesrinpatch
2019-09-07Merge branch 'develop' into support/testsMaksim Pechnikov
2019-09-06tests for mastodon_api_controller.exMaksim Pechnikov
2019-09-06generating remote usersAlex S
2019-09-06[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs
2019-09-05Move checking for restrict_local to User.get_cached_by_id_or_nicknamerinpatch
2019-09-04don't try to truncate non-stringsSadposter
2019-09-04truncate remote user bio/display nameSadposter
2019-09-04add tests for activity_pub/utils.exMaksim Pechnikov
2019-09-03Mastdon API: Add ability to get a remote account by nickname torinpatch
`/api/v1/accounts/:id`
2019-08-31[#1149] Refactored Oban workers API (introduced `enqueue/3`).Ivan Tashkinov
2019-08-31[#1149] Addressed code review comments (code style, jobs pruning etc.).Ivan Tashkinov
2019-08-31[#1149] Added Oban job for "activity_expiration". Merged remote-tracking ↵Ivan Tashkinov
branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts: # config/config.exs
2019-08-24Merge branch 'admin-create-users' into 'develop'lain
user creation admin api will create multiple users See merge request pleroma/pleroma!1170
2019-08-22[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs
2019-08-20Merge branch 'feature/custom-fields' into 'develop'lain
Add custom profile fields See merge request pleroma/pleroma!1488
2019-08-19Merge branch 'hotfix/user_unfollow' into 'develop'lain
[#1177] fixed User.unfollow with synchronization external user See merge request pleroma/pleroma!1579
2019-08-18clear follow requests when blocking a userSadposter
2019-08-16fixed User.unfollow with synchronization external userMaksim Pechnikov
2019-08-16Merge branch 'pleroma-conversations' into 'develop'lain
Extended Pleroma Conversations See merge request pleroma/pleroma!1535
2019-08-15Cache follow staterinpatch
2019-08-14Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov