be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
6 years ago
07afb9b537
update the follower count when a follower is blocked
6 years ago
589629cf3e
Used cached user resources in subscriptions
6 years ago
87a01f9ee0
Use Pleroma.Config instead of Application.get_env
6 years ago
13ff312c48
Sever subscription in case of block
6 years ago
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
6 years ago
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
6 years ago
007762e767
Add notification checks
6 years ago
79910ce5cc
Add API endpoints and user column for subscription
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
6 years ago
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
6 years ago
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
a14742f495
add `user delete_activities` mix task
6 years ago
a1869f5272
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
6 years ago
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
6 years ago
3cf7539bca
Add more user filters + move search to its own module
6 years ago
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
6 years ago
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
6f090f981b
Attempt to fix incorrect federation of default instance avatars
6 years ago
332dc1371b
user: use preloads when deleting accounts
6 years ago
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
6 years ago
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
6 years ago
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
6 years ago
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
7ac9fff437
Format
6 years ago
ed8a2935f5
Use ILIKE to search users
6 years ago
67ff8d9311
user: properly cope with actors which do not declare a followers collection
6 years ago
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
6 years ago
a1aacc08a4
Check if the user has indeed not been federated with
...
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
6 years ago
8d21859717
[ #923 ] External User registration refactoring, password randomization.
6 years ago
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
93291c3d7a
Order users by nickname
6 years ago
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
da53c079db
Refactor to store user ap_id, add tests
6 years ago
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
8cd3eada7d
[Credo] write large numbers with underscore separation
6 years ago
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
d013b58e84
add `mix pleroma.user delete_activities NICKNAME` task
6 years ago
Sadposter