aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
AgeCommit message (Collapse)Author
2020-03-08Merge branch 'develop' into issue/1469issue/1469Maksim Pechnikov
2020-03-02Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn
ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-01ActivityPub actions & side-effects in transactionAlexander Strizhakov
2020-02-25Fix Dialyzer warningsEgor Kislitsyn
2020-02-11Merge branch 'develop' into issue/1469Maksim Pechnikov
2020-02-07Add User.get_follow_state/2Egor Kislitsyn
2020-02-06updated generate urlsMaksim Pechnikov
2020-02-05Add support for cancellation of a follow requestEgor Kislitsyn
2020-01-28update ectoMaksim Pechnikov
2020-01-17updated error messages for authentication processMaksim Pechnikov
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks # Conflicts: # lib/pleroma/user.ex
2020-01-10Merge branch 'issue/1490' into 'develop'lain
[#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵Ivan Tashkinov
migrated existing OAuth records. Adjusted tests.
2020-01-08fix create service actorMaksim Pechnikov
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-12-10Apply suggestion to lib/pleroma/user.exSadposter
2019-12-10Merge branch 'develop' into 'domain-block-precedence'Sadposter
# Conflicts: # lib/pleroma/user.ex
2019-12-10modify SQL to include followed-but-domain-blocked activitiesSadposter
2019-12-10Merge branch 'develop' into '1427-oauth-admin-scopes'lain
# Conflicts: # CHANGELOG.md
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-10Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1427-oauth-admin-scopes # Conflicts: # CHANGELOG.md
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-07[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.Ivan Tashkinov
2019-12-06Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1427-oauth-admin-scopes
2019-12-06[#1427] Reworked admin scopes support.Ivan Tashkinov
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-12-05Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-04[#1335] Merge issue fix.Ivan Tashkinov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
Removed users.info field See merge request pleroma/pleroma!2006
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28added User.NotificationSetting structMaksim Pechnikov
2019-11-28obligatory format commitSadposter
2019-11-28make follows take precedence over domain blocksSadposter
2019-11-27Remove User.user_info/2Egor Kislitsyn
2019-11-26Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-23Removed users.info and remaining usages.Ivan Tashkinov
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994
2019-11-22Swap map with eachMaxim Filippov
2019-11-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs
2019-11-21Merge branch 'issue/1348' into 'develop'lain
[#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937
2019-11-21Fix user.following_countEgor Kislitsyn
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵Ivan Tashkinov
UserRelationship-related functionality.
2019-11-20[#1335] User AP ID relations fetching performance optimizations.Ivan Tashkinov
2019-11-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-18[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced ↵Ivan Tashkinov
EctoEnum.
2019-11-15Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 20:56:44 +0000