Ekaterina Vaartis
|
092b1b1453
|
Do not unfollow muted users
|
2019-02-19 21:49:55 +03:00 |
|
Ekaterina Vaartis
|
f41f017bbc
|
Implement muting, add it to the mastodon API
|
2019-02-19 21:49:55 +03:00 |
|
lambda
|
1dd718e83c
|
Merge branch 'set-cache-on-user-tag-update' into 'develop'
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
|
2019-02-19 14:20:58 +00:00 |
|
lambda
|
f53dc5ee08
|
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
|
2019-02-19 14:07:16 +00:00 |
|
rinpatch
|
109b01a631
|
mark ap_id unique_constraint
|
2019-02-19 13:52:15 +03:00 |
|
eugenijm
|
fc35481445
|
Update user cache when user tags are updated
|
2019-02-19 10:43:38 +03:00 |
|
kaniini
|
cd019a5927
|
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
|
2019-02-18 04:01:26 +00:00 |
|
lain
|
d812a347ca
|
Add optional welcome message.
|
2019-02-16 16:42:34 +01:00 |
|
eugenijm
|
ecdf0657ba
|
Add logic for keeping follow_request_count up-to-date on the `follow`,
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
|
2019-02-15 12:20:20 +03:00 |
|
William Pitcock
|
da44cdd381
|
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
get_or_fetch() handles the nickname verses URI differences transparently.
|
2019-02-14 20:00:04 +00:00 |
|
lain
|
88a4de24f9
|
User.follow_all: Respect blocks in both directions.
|
2019-02-13 13:52:27 +01:00 |
|
kaniini
|
6c8d15da11
|
Merge branch 'fix/credo-issues' into 'develop'
Fix credo issues
See merge request pleroma/pleroma!786
|
2019-02-10 20:54:21 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6a6a5b3251
|
de-group alias/es
|
2019-02-09 16:31:17 +01:00 |
|
lain
|
563f04e81b
|
Do autofollow first.
|
2019-02-09 13:39:57 +01:00 |
|
lain
|
bbd0049fae
|
Respect blocks in mass follow.
|
2019-02-09 13:24:23 +01:00 |
|
href
|
308b35ebe2
|
User.follow_all: ensure its stays unique
|
2019-01-31 18:17:44 +01:00 |
|
Haelwenn
|
00d4333373
|
Merge branch 'features/glitch-soc-frontend' into 'develop'
Features/glitch soc frontend
See merge request pleroma/pleroma!192
|
2019-01-31 10:16:11 +00:00 |
|
lain
|
47ec690c54
|
Use race-condition free mass follow.
|
2019-01-30 19:33:25 +01:00 |
|
lain
|
935e65e261
|
Use race-condition free following method.
|
2019-01-30 19:21:04 +01:00 |
|
Haelwenn (lanodan) Monnier
|
cda1470e02
|
[MastoAPI][GlitchAPI] Add bookmarks
|
2019-01-28 04:47:32 +01:00 |
|
kaniini
|
c9b418e547
|
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
|
2019-01-25 05:00:47 +00:00 |
|
href
|
28d77e373c
|
Flake Ids for Users and Activities
|
2019-01-23 11:26:27 +01:00 |
|
Ivan Tashkinov
|
34d59e4008
|
[#502] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
|
2019-01-22 17:12:53 +03:00 |
|
lambda
|
f3045a179e
|
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
|
2019-01-20 10:24:05 +00:00 |
|
lain
|
5834b08fe7
|
Set custom similarity limit.
|
2019-01-20 10:57:49 +01:00 |
|
lain
|
b108aeee08
|
Make use of the indices.
Indices in postgresql rely on operators, so they won't be used if you use only functions.
|
2019-01-20 00:31:17 +01:00 |
|
kaniini
|
651ce1c97b
|
Merge branch '491_full_mentions_in_user_bio' into 'develop'
[#491] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
|
2019-01-19 07:36:58 +00:00 |
|
rinpatch
|
74346a7035
|
Fix merge conflict
|
2019-01-18 18:31:25 +03:00 |
|
Ivan Tashkinov
|
79e44042bc
|
[#477] User trigram index adjustment.
|
2019-01-18 10:57:42 +03:00 |
|
Ivan Tashkinov
|
ed8f55ab8e
|
[#477] User: FTS and trigram search results mixing (to handle misspelled requests).
|
2019-01-18 10:35:45 +03:00 |
|
Ivan Tashkinov
|
65bb9b2fba
|
[#491] Made full nicknames be preserved in user links text only in Bio.
|
2019-01-18 09:30:16 +03:00 |
|
Ivan Tashkinov
|
954dc4a4ad
|
[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
|
2019-01-17 19:16:02 +03:00 |
|
rinpatch
|
388ceb6a7d
|
Fix the issue with get_by_nickname never being called
|
2019-01-17 19:00:08 +03:00 |
|
rinpatch
|
5fa508cc2b
|
Remove @providers and call Pleroma.config on runtime
|
2019-01-16 18:04:41 +03:00 |
|
rinpatch
|
bb43f4cee9
|
Remove useless with in opengraph.ex
|
2019-01-16 18:02:46 +03:00 |
|
rinpatch
|
9a90b5d91a
|
oof
|
2019-01-16 18:01:17 +03:00 |
|
rinpatch
|
8a9f089812
|
remove id cast
|
2019-01-16 17:58:11 +03:00 |
|
rinpatch
|
5a08dee379
|
cache ap_id in id instead of caching user two times
|
2019-01-16 17:44:08 +03:00 |
|
lain
|
943324b661
|
MastoAPI: Don't break on missing users.
|
2019-01-16 15:13:09 +01:00 |
|
Ivan Tashkinov
|
0bc6d30f7d
|
[#477] Minor refactoring (user search query).
|
2019-01-16 10:44:32 +03:00 |
|
Ivan Tashkinov
|
5b8f9ff8c1
|
[#477] User search tests. Normalized search rank in User.search.
|
2019-01-15 13:05:25 +03:00 |
|
rinpatch
|
6f23139864
|
please don't bully me for this
|
2019-01-15 12:02:55 +03:00 |
|
rinpatch
|
4587a5712a
|
cringe
|
2019-01-15 11:59:05 +03:00 |
|
rinpatch
|
ce15e0659e
|
Fix some edge cases [nervous laughter]
|
2019-01-15 11:56:35 +03:00 |
|
Ivan Tashkinov
|
dc45ec62c2
|
[#477] User search improvements: tsquery search with field weights, friends & followers boosting.
|
2019-01-14 20:04:45 +03:00 |
|
rinpatch
|
5f9786288d
|
Prefer ids to usernames
|
2019-01-14 09:52:52 +03:00 |
|
rinpatch
|
e4dc3f71ae
|
Resolve merge conflict
|
2019-01-13 13:38:28 +03:00 |
|
kaniini
|
11d08c6226
|
Merge branch 'twapi-follower-pagination' into 'develop'
Twapi follower pagination
See merge request pleroma/pleroma!648
|
2019-01-10 18:03:32 +00:00 |
|
lain
|
7ac152ed38
|
TwitterAPI: Add follower/following pagination.
|
2019-01-09 18:14:32 +01:00 |
|
lain
|
65fc2df7cc
|
Use follow_all in autofollow.
|
2019-01-09 11:38:45 +01:00 |