Sadposter
|
457821adb0
|
Apply suggestion to lib/pleroma/user.ex
|
5 years ago |
Sadposter
|
8cfaab8f04
|
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
Sadposter
|
19d228cc58
|
modify SQL to include followed-but-domain-blocked activities
|
5 years ago |
lain
|
1ae976ac51
|
Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Hakaba Hitoyo
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
5 years ago |
Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Maksim Pechnikov
|
95e6a2acd9
|
Merge branch 'develop' into issue/1342
|
5 years ago |
Ivan Tashkinov
|
1770602747
|
[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
|
5 years ago |
Ivan Tashkinov
|
13926537b6
|
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
|
5 years ago |
Ivan Tashkinov
|
af42c00cff
|
[#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
|
5 years ago |
Maksim Pechnikov
|
3fe7a1fd35
|
Merge branch 'develop' into issue/1342
|
5 years ago |
Ivan Tashkinov
|
d3bce89edd
|
[#1335] Merge issue fix.
|
5 years ago |
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
5 years ago |
rinpatch
|
0d24ab04c5
|
Merge branch 'remove-info-from-users' into 'develop'
Removed users.info field
See merge request pleroma/pleroma!2006
|
5 years ago |
Ivan Tashkinov
|
52cc7de82c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
|
5 years ago |
Maksim Pechnikov
|
a52da55eb9
|
added User.NotificationSetting struct
|
5 years ago |
Sadposter
|
c7cc80a9ee
|
obligatory format commit
|
5 years ago |
Sadposter
|
fa97eddf8a
|
make follows take precedence over domain blocks
|
5 years ago |
Egor Kislitsyn
|
f595cfe623
|
Remove User.user_info/2
|
5 years ago |
Ivan Tashkinov
|
c8d3c3bfec
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
|
5 years ago |
Ivan Tashkinov
|
1636cc5b7e
|
Removed users.info and remaining usages.
|
5 years ago |
lain
|
bd62946020
|
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
|
5 years ago |
Maxim Filippov
|
b64c7b35d4
|
Swap map with each
|
5 years ago |
Ivan Tashkinov
|
cad9b325e5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
|
5 years ago |
lain
|
8feb5dcb42
|
Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
|
5 years ago |
Egor Kislitsyn
|
d38ab4bb89
|
Fix user.following_count
|
5 years ago |
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
5 years ago |
Ivan Tashkinov
|
555edd01ab
|
[#1335] User AP ID relations fetching performance optimizations.
|
5 years ago |
Ivan Tashkinov
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
5 years ago |
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
5 years ago |
Ivan Tashkinov
|
aad6576130
|
[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
|
5 years ago |
Ivan Tashkinov
|
01d9c093c3
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
|
5 years ago |
Ivan Tashkinov
|
c31ddce51e
|
[#1335] Reorganized `users.mutes` as relation to UserMute entity.
|
5 years ago |
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
5 years ago |
Egor Kislitsyn
|
e6d7e27bd6
|
Add `allow_following_move` setting to User
|
5 years ago |
lain
|
8521553ad9
|
User: Don't let deactivated users authenticate.
|
5 years ago |
Ivan Tashkinov
|
5cf2c7422b
|
[#1335] Applied code review suggestions.
|
5 years ago |
Ivan Tashkinov
|
3db988250b
|
[#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
|
5 years ago |
Maksim Pechnikov
|
4b7c11e3f9
|
excluded invisible actors from gets /api/v1/accounts/:id
|
5 years ago |
lain
|
0c31258616
|
User: Don't pull remote users follower count immediately after deactivating.
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
|
5 years ago |
Egor Kislitsyn
|
4270861085
|
Merge branch 'develop' into feature/move-activity
|
5 years ago |
lain
|
2480200759
|
Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
|
5 years ago |
eugenijm
|
0580654485
|
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
|
5 years ago |
Egor Kislitsyn
|
b777083f3f
|
Add `also_known_as` field to Pleroma.User
|
5 years ago |
Egor Kislitsyn
|
dbee53c2df
|
Remove unused Pleroma.User.info_fields/0
|
5 years ago |
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
5 years ago |
Ivan Tashkinov
|
11cd994425
|
[#1304] Fixed null::jsonb handling in User.Info migration.
|
5 years ago |
Ivan Tashkinov
|
7c7f90bc4f
|
[#1304] Merged `develop`, handled User.Info.invisible.
|
5 years ago |
Ivan Tashkinov
|
a11a7176d5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
|
5 years ago |