Ivan Tashkinov
|
4f8c3462a8
|
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
|
5 years ago |
|
Maksim Pechnikov
|
bcffa662dc
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Maksim Pechnikov
|
108a39c876
|
updated error messages for authentication process
|
5 years ago |
|
Maksim Pechnikov
|
c9f45edeac
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Maksim Pechnikov
|
70410dfafd
|
fix create service actor
|
5 years ago |
|
Maksim Pechnikov
|
a879c396bb
|
Merge branch 'develop' into feature/tag_feed
|
5 years ago |
|
Sadposter
|
8cfaab8f04
|
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
|
Maksim Pechnikov
|
22fc271e23
|
init tag feed
|
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 |
|
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 |
|
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
|
1636cc5b7e
|
Removed users.info and remaining usages.
|
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
|
ba5cc30165
|
[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
|
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 |
|
lain
|
8521553ad9
|
User: Don't let deactivated users authenticate.
|
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 |
|
kPherox
|
d1ae51b02a
|
Update test for get_recipients_from_activity
|
5 years ago |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
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
|
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
|
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
|
48059c03c9
|
fix up some tests
|
5 years ago |
|
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
5 years ago |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
|
Egor Kislitsyn
|
1d46944fbd
|
Do not add `follower_address` to `following` for non local users
|
5 years ago |
|
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
5 years ago |
|
Sergey Suprunenko
|
4b3f77a99f
|
Extract RSS Feed functionality from OStatus
|
5 years ago |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of `user.info`
|
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 |
|
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 |
|
kaniini
|
29dd8ab9c0
|
Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
|
5 years ago |
|
Maxim Filippov
|
6f25668215
|
Admin API: Add ability to force user's password reset
|
5 years ago |
|
Egor Kislitsyn
|
95c948110c
|
Add `rel="ugc"` to hashtags and mentions
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
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 |
