Mark Felder
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-18 14:58:21 -06:00
Mark Felder
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
2021-01-18 12:05:05 -06:00
Mark Felder
d36182c088
Change user.confirmation_pending field to user.is_confirmed
2021-01-15 12:44:41 -06:00
Mark Felder
cd1e5d76ab
Remove User.restrict_deactivated/1
...
Everything else is in User.Query, no need for this odd kludge.
2021-01-15 11:24:46 -06:00
Mark Felder
860b5c7804
Change user.deactivated field to user.is_active
2021-01-15 11:24:46 -06:00
Mark Felder
f7e59c28ed
Change user.approval_pending field to user.is_approved
2021-01-15 10:42:02 -06:00
Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
Egor Kislitsyn
35ba48494f
Stream follow updates
2020-12-02 00:18:58 +04:00
Ivan Tashkinov
e164c37139
[ #2301 ] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.
2020-11-19 19:30:02 +03:00
Ivan Tashkinov
fcad3e716a
[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.
2020-11-19 18:08:22 +03:00
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
Maksim Pechnikov
60663150b5
admin user search: added filter by actor_type
2020-10-22 11:53:28 +03:00
Maksim Pechnikov
46b420aa60
need_confirmed -> unconfirmed
2020-10-22 11:50:49 +03:00
Maksim Pechnikov
9ef46ce410
added 'unconfirmed' filter to admin/users
2020-10-22 11:50:49 +03:00
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
Egor Kislitsyn
ad605e3e16
Rename Pleroma.Backup to Pleroma.User.Backup
2020-10-20 17:16:58 +04:00
Mark Felder
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
lain
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
feld
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
2020-09-25 16:15:01 +00:00
lain
05b5241314
Linter fixes
2020-09-25 09:12:48 +02:00
lain
a8c17ea25a
User Search: Also find user by uri
2020-09-25 08:46:14 +02:00
lain
d0078bc404
User Search: Boost resolved results and exact ap_id matches.
2020-09-24 15:54:55 +02:00
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
Egor Kislitsyn
0e0ece251a
Filter out internal users by default
2020-09-22 16:56:11 +04:00
Maksim Pechnikov
2ec0dcf001
Merge branch 'develop' into issue/2099
2020-09-18 07:08:37 +03:00
stwf
41939e3175
User search respect discoverable flag
2020-09-17 12:15:50 -04:00
Maksim Pechnikov
5a8ea0a5b0
small refactoring
2020-09-17 09:13:43 +03:00
Maksim Pechnikov
b867f9d7ae
Merge branch 'develop' into issue/2099
2020-09-17 08:41:35 +03:00
Mark Felder
75b6fef25d
Add mix task for bulk [un]confirming the local instance users
2020-09-08 16:39:41 -05:00
Mark Felder
23ca5f75af
Make it possible to bulk send confirmation emails to all unconfirmed users
2020-09-08 16:39:08 -05:00
Haelwenn (lanodan) Monnier
16c451f8f1
search: Apply following filter only when user is usable
2020-09-08 20:21:34 +03:00
Maksim Pechnikov
5ae56aafb2
added import mutes
2020-09-06 21:42:51 +03:00
Karol Kosek
868057871a
search: fix 'following' query parameter
...
The parameter included the accounts that are following you (followers)
instead of those you are actually following.
Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2020-09-02 02:08:43 +02:00
Egor Kislitsyn
249f21dcbb
Admin API: Filter out unapproved users when the active filter is on
2020-08-10 18:27:39 +04:00
Ilja
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
2020-08-02 15:54:59 +02:00
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
Maksim Pechnikov
61ef1fca4b
remove duplicate module
2020-07-24 08:35:06 +03:00
Maksim Pechnikov
5879d36854
fix sender for welcome email
2020-07-22 15:34:47 +03:00
Maksim Pechnikov
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by need_approval
2020-07-14 14:29:03 -05:00
Mark Felder
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
Ivan Tashkinov
123352ffa1
Removed unused trigram index on users. Fixed users_fts_index usage.
2020-07-08 22:50:15 +03:00
Ivan Tashkinov
704a383055
Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
2020-07-08 13:14:18 +03:00
Ivan Tashkinov
90764670dc
[ #1892 ] Excluded internal users (applications) from user search results, reinstated service actors in search results.
2020-07-03 11:02:15 +03:00
Ivan Tashkinov
3d2989278c
[ #1892 ] Excluded bot actors (applications, services) from search results.
2020-06-30 21:26:39 +03:00
Mark Felder
69848d5c97
Rename notification "privacy_option" setting
2020-06-26 12:45:46 -05:00
Mark Felder
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
Mark Felder
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
rinpatch
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
2020-06-02 13:34:12 +03:00
