Maksim Pechnikov
|
108a39c876
|
updated error messages for authentication process
|
5 years ago |
Ivan Tashkinov
|
39ce894a07
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
lain
|
05ca420c09
|
Merge branch 'issue/1490' into 'develop'
[#1490] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
|
5 years ago |
Ivan Tashkinov
|
6c94b7498b
|
[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
|
5 years ago |
Maksim Pechnikov
|
70410dfafd
|
fix create service actor
|
5 years ago |
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
5 years ago |
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 |
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
5 years ago |
Ivan Tashkinov
|
ee04fbc35a
|
[#1304]. Post-merge fixes. Merge branch 'develop' of 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
|
5 years ago |
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 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
|
5 years ago |
Ivan Tashkinov
|
b4cbf0568b
|
[#1304] Analysis issue fix.
|
5 years ago |
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
5 years ago |
Ariadne Conill
|
95871cb462
|
user: implement User.invisible?/1
|
5 years ago |
Ariadne Conill
|
d379b48769
|
kill almost all of the OStatus module
|
5 years ago |
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
5 years ago |
rinpatch
|
39e996528c
|
Fix a migration wiping user info of users that don't have any mutes
And introduce safe_jsonb_set
|
5 years ago |
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
feld
|
21f0757b0d
|
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
|
5 years ago |
Maxim Filippov
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
5 years ago |
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
5 years ago |
lain
|
c54ae662dc
|
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
|
5 years ago |
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
5 years ago |
rinpatch
|
fefbd31c6e
|
Move local keys out of `user.info`
|
5 years ago |
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
5 years ago |
kaniini
|
5c04e81724
|
Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
|
5 years ago |
rinpatch
|
8217292085
|
Fix get_cached_by_nickname_or_id not allowing to get local users by
nickname
Closes #1293
|
5 years ago |
eugenijm
|
06d9df79c5
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
Maksim Pechnikov
|
3d722dc200
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
kaniini
|
48a82c4609
|
Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
|
5 years ago |
kaniini
|
3ff57f1fd3
|
Merge branch 'hex-flake-id' into 'develop'
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
|
5 years ago |
Egor Kislitsyn
|
b5dfe83433
|
Replace `Pleroma.FlakeId` with `flake_id` hex package
|
5 years ago |
Egor Kislitsyn
|
1bea67cb5e
|
Cleanup Pleroma.User
|
5 years ago |
Egor Kislitsyn
|
209395c7e6
|
Add User.change_info/2 and User.update_info/2
|
5 years ago |
Egor Kislitsyn
|
79b25be4e1
|
Do not return tuple when unneeded
|
5 years ago |
Maksim Pechnikov
|
d75d0ae134
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
Maksim Pechnikov
|
179fa32dd5
|
Merge branch 'develop' into tests/mastodon_api_controller.ex
|
5 years ago |
Maxim Filippov
|
6f25668215
|
Admin API: Add ability to force user's password reset
|
5 years ago |
rinpatch
|
95a4a19417
|
Merge branch 'support/tests' into 'develop'
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
|
5 years ago |
kaniini
|
17142a3720
|
Merge branch 'feature/delivery-tracking' into 'develop'
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
|
5 years ago |
Maksim Pechnikov
|
8751809e1e
|
Merge branch 'develop' into support/tests
|
5 years ago |
Ivan Tashkinov
|
610236d6be
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
|
5 years ago |
rinpatch
|
62bbba80f3
|
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
Truncate remote user fields
See merge request pleroma/pleroma!1619
|
5 years ago |
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
5 years ago |
rinpatch
|
ba70a8cae6
|
Merge branch 'develop' into feature/delivery-tracking
|
5 years ago |
lain
|
53a3ad6043
|
Merge branch 'cleanup-activity' into 'develop'
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
|
5 years ago |
rinpatch
|
ce23529d91
|
Use delivery info when federating deletes
|
5 years ago |
Egor Kislitsyn
|
25d8216804
|
Add email change endpoint
|
5 years ago |
Egor Kislitsyn
|
39dc9b470c
|
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
|
5 years ago |
rinpatch
|
769fb778d4
|
Track object/create activity fetches
|
5 years ago |
Maksim Pechnikov
|
39f99dc6cd
|
Merge branch 'develop' into support/tests
|
5 years ago |