aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
AgeCommit message (Collapse)Author
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of ↵Ivan Tashkinov
git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20[#1304] Analysis issue fix.Ivan Tashkinov
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-19user: implement User.invisible?/1Ariadne Conill
2019-10-18kill almost all of the OStatus moduleAriadne Conill
2019-10-18websub: remove entirelyAriadne Conill
2019-10-18Fix a migration wiping user info of users that don't have any mutesrinpatch
And introduce safe_jsonb_set
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-16Merge branch 'feature/multiple-users-activation-permissions' into 'develop'feld
Ability to toggle activation status, permission group & delete multiple users Closes admin-fe#39 See merge request pleroma/pleroma!1825
2019-10-15DELETE /api/pleroma/admin/users now accepts nicknames arrayMaxim Filippov
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-10Merge remote-tracking branch 'origin/develop' into benchmark-finishinglain
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 04:40:02 +0000