Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov
04a8ffbe84
added privacy option to push notifications
5 years ago
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
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
Ivan Tashkinov
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
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
62bc0657e7
excluded invisible users from search results
5 years ago
lain
4e53520917
User Search: Remove superfluous setweight and random test.
...
The test tested for a behavior that isn't actually enforced anymore.
5 years ago
kPherox
363e76d4da
Fix duplicate recipients
5 years ago
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
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
835ad52378
remove Salmon module
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
rinpatch
0a5175ecbb
Order fts results by trigram
5 years ago
rinpatch
c10ce113d4
User search: Remove trigram and refactor the module
...
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
5 years ago
Egor Kislitsyn
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
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
eugenijm
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
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
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
Maxim Filippov
d72d4757a8
Format
5 years ago
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
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
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Sadposter
d0f07e55d2
use atom key for fields
5 years ago
Sadposter
05c935c396
mix format
5 years ago
Sadposter
35ef470d00
truncate fields for remote users instead
5 years ago
Maxim Filippov
5e4fde1d3d
Filter logs by date
5 years ago
kPherox
3549cd9754
Change to use attachment only when fields do not exist
5 years ago
Egor Kislitsyn
672fcbc7b7
Limit custom fields for old remote users
5 years ago
Egor Kislitsyn
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
5 years ago
Egor Kislitsyn
2c35d4b0b0
Add configurable account field name length limit
5 years ago
Egor Kislitsyn
db3c05f6b4
Add configurable account field value length limit
5 years ago
Egor Kislitsyn
a22f540fc4
Add custom fields to TwitterAPI.UserView
5 years ago
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
5 years ago
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
Sergey Suprunenko
040347b248
Remove spaces from the domain search
5 years ago
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
rinpatch
196cad46f3
Resolve merge conflicts
5 years ago
Roman Chvanikov
ae4fc58589
Remove flavour from userinfo
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago