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 |
|
Maksim Pechnikov
|
ab2f21e470
|
tests for mastodon_api_controller.ex
|
5 years ago |
|
Alex S
|
b3f6f6a409
|
generating remote users
|
5 years ago |
|
Ivan Tashkinov
|
ca1ba1e272
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
26fe6f70c9
|
Move checking for restrict_local to User.get_cached_by_id_or_nickname
|
5 years ago |
|
Sadposter
|
cb99cfcc65
|
don't try to truncate non-strings
|
5 years ago |
|
Sadposter
|
2975da284b
|
truncate remote user bio/display name
|
5 years ago |
|
Maksim Pechnikov
|
8cbad5500c
|
add tests for activity_pub/utils.ex
|
5 years ago |
|
rinpatch
|
cc1d1ee406
|
Mastdon API: Add ability to get a remote account by nickname to
`/api/v1/accounts/:id`
|
5 years ago |
|
Ivan Tashkinov
|
dd017c65a4
|
[#1149] Refactored Oban workers API (introduced `enqueue/3`).
|
5 years ago |
|
Ivan Tashkinov
|
a90ea8ba15
|
[#1149] Addressed code review comments (code style, jobs pruning etc.).
|
5 years ago |
|
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
5 years ago |
|
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
5 years ago |
|
Ivan Tashkinov
|
256ff09aa8
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
5 years ago |
|
lain
|
ef43016b2c
|
Merge branch 'feature/custom-fields' into 'develop'
Add custom profile fields
See merge request pleroma/pleroma!1488
|
5 years ago |
|
lain
|
49ae3191df
|
Merge branch 'hotfix/user_unfollow' into 'develop'
[#1177] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
|
5 years ago |
|
Sadposter
|
94e336d9d5
|
clear follow requests when blocking a user
|
5 years ago |
|
Maksim Pechnikov
|
3315a2a1c3
|
fixed User.unfollow with synchronization external user
|
5 years ago |
|
lain
|
7ab2dbbdb6
|
Merge branch 'pleroma-conversations' into 'develop'
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
|
5 years ago |
|
rinpatch
|
bd5ad0af78
|
Cache follow state
|
5 years ago |
|
Ivan Tashkinov
|
8778c16dac
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
lain
|
560dbad538
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
5 years ago |
|
Egor Kislitsyn
|
e457fcc479
|
Add `:max_remote_account_fields` config option
|
5 years ago |
|
rinpatch
|
83a3de8cc4
|
Merge branch 'length-limit-bio' into 'develop'
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
|
5 years ago |
|
Ivan Tashkinov
|
0e1c481a94
|
[#1149] Added more oban workers. Refactoring.
|
5 years ago |
|
lain
|
a2b98f6d58
|
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
|
5 years ago |
|
Roman Chvanikov
|
9d4f34fbcb
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
lain
|
5ff8f07ca9
|
Merge branch 'feature/hide-follows-remote' into 'develop'
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
|
5 years ago |
|
lain
|
f88560accd
|
Conversations: Add recipient list to conversation participation.
This enables to address the same group of people every time.
|
5 years ago |
|
Egor Kislitsyn
|
9ca4506355
|
Add configurable length limits for `User.bio` and `User.name`
|
5 years ago |
|
rinpatch
|
301ea0dc04
|
Add tests for counters being updated on follow
|
5 years ago |
|
Maksim
|
58443d0cd6
|
tests for TwitterApi/UtilController
|
5 years ago |
|
rinpatch
|
f42719506c
|
Fix credo issues
|
5 years ago |
|
rinpatch
|
c88a5d3251
|
Merge branch 'develop' into feature/hide-follows-remote
|
5 years ago |
|
Maksim
|
6a4b8b2681
|
fixed User.update_and_set_cache for stale user
|
5 years ago |
|
rinpatch
|
41e0304757
|
Merge branch 'develop' into feature/hide-follows-remote
|
5 years ago |
|
Eugenij
|
4504135894
|
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
|
5 years ago |
|
Roman Chvanikov
|
d2da3d30f3
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
Maksim
|
c49a09ed88
|
tests for Pleroma.Web.ActivityPub.Publisher
|
5 years ago |
|
Sadposter
|
54a161cb7a
|
move unauth'd user blocks?/2 check
|
5 years ago |
|
Alexander Strizhakov
|
b70e659304
|
Feature/1087 wildcard option for blocks
|
5 years ago |
|
rinpatch
|
196cad46f3
|
Resolve merge conflicts
|
5 years ago |
|
rinpatch
|
d4ee76ab63
|
Apply suggestion to lib/pleroma/user.ex
|
5 years ago |
|
Roman Chvanikov
|
8292331b35
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
Ivan Tashkinov
|
d0198fe215
|
[#1112] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
|
5 years ago |
|
Roman Chvanikov
|
36049f08ef
|
Merge develop
|
5 years ago |
|
Ariadne Conill
|
62e5ff624e
|
user: add is_internal_user? helper function
|
5 years ago |
|
Ariadne Conill
|
4885473be2
|
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
|
5 years ago |
