bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
2021-12-19 17:30:52 +00:00
b686d68cdb
Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
...
Bump alpine to 3.14
See merge request pleroma/pleroma!3569
2021-12-18 15:04:55 +00:00
ff17884c3b
Bump alpine to 3.14
2021-12-17 18:03:06 -05:00
8376e83f61
Lint
2021-12-17 16:52:50 -05:00
538d5ac210
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
2021-12-17 16:47:48 -05:00
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
2021-12-17 16:44:22 -05:00
bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
2021-12-17 14:44:28 -05:00
3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
...
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
2021-12-17 14:17:51 -05:00
8cfd527589
Merge branch 'verbose-emoji-loader' into 'develop'
...
emoji/loader.ex: be more verbose about which emoji pack config is loading now
See merge request pleroma/pleroma!3567
2021-12-17 14:35:01 +00:00
a1batross
31b9034a27
emoji/loader.ex: be more verbose about which emoji pack config is loading now
...
To avoid issue when one of the hundred JSON files is malformed and
administrator don't know which one
2021-12-17 14:15:44 +00:00
5660bee2dc
Dirty hack to make mediaproxy functional by relying on Hackney for that part
2021-12-16 11:36:58 -06:00
FloatingGhost
1863ae59fb
format
2021-12-16 16:13:48 +00:00
FloatingGhost
415d9dd6f6
Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
2021-12-16 16:13:41 +00:00
FloatingGhost
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-16 16:10:08 +00:00
FloatingGhost
3a9b83413e
Merge branch 'develop' into feature/elasticsearch
2021-12-16 16:07:15 +00:00
FloatingGhost
f3d9c58fef
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-12-16 16:07:00 +00:00
FloatingGhost
742b86fdaa
format
2021-12-16 16:05:33 +00:00
FloatingGhost
9134ef5ecb
add timestamp
2021-12-16 16:05:18 +00:00
FloatingGhost
2152832780
add timestamp
2021-12-16 15:58:56 +00:00
FloatingGhost
26cae62c7f
maybe
2021-12-16 15:20:34 +00:00
FloatingGhost
9d4727598d
fix remote hashtags
2021-12-16 15:20:34 +00:00
FloatingGhost
1745606ab5
maybe
2021-12-16 15:20:22 +00:00
FloatingGhost
418212c71c
fix remote hashtags
2021-12-16 15:09:36 +00:00
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
6eb7d69e60
Merge branch 'delete-account-fix' into 'develop'
...
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
2021-12-15 21:26:45 +00:00
4e98ba3c3a
Application: Actually start finch if it's needed
2021-12-15 15:42:37 -05:00
abb62dd886
Application, dependencies: prepare for finch
2021-12-15 13:53:09 -05:00
25920c10df
don't try indexing non-people
2021-12-15 11:08:13 +00:00
93e41df75d
don't try indexing non-people
2021-12-15 11:05:30 +00:00
FloatingGhost
ccc5c59c50
re-add fetching by url
2021-12-15 10:58:09 +00:00
FloatingGhost
d5c8415496
re-add fetching by url
2021-12-15 10:57:47 +00:00
c50ad91d31
fix empty queries returning 50 results
2021-12-14 15:02:48 +00:00
7f30218b82
extra cool
2021-12-14 15:02:48 +00:00
d1bb10c88e
fix empty queries returning 50 results
2021-12-14 15:02:11 +00:00
8378c3a8bc
extra cool
2021-12-14 14:48:24 +00:00
FloatingGhost
0d7bbee430
add timeouts
2021-12-14 14:35:46 +00:00
FloatingGhost
bed6f4e12c
add timeouts
2021-12-14 14:33:34 +00:00
FloatingGhost
9d5d964bf8
merge
2021-12-14 14:28:15 +00:00
cc4c5f22f4
fix inbound federation
2021-12-14 14:27:42 +00:00
94c22baaa3
filter by user type
2021-12-14 14:16:21 +00:00
8f78cb3050
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
2021-12-14 14:01:09 +00:00
5d901c337e
fix inbound federation
2021-12-14 13:58:16 +00:00
FloatingGhost
703f53c08f
Search through users and hashtags as well
2021-12-14 13:55:14 +00:00
FloatingGhost
a85bf5929b
add hashtag indexing
2021-12-14 13:55:14 +00:00
FloatingGhost
6ca70833f5
add user import
2021-12-14 13:55:14 +00:00
FloatingGhost
0b5206015b
add mappings
2021-12-14 13:55:14 +00:00
FloatingGhost
c03e8d46e8
Search through users and hashtags as well
2021-12-14 13:53:46 +00:00
FloatingGhost
8547cefaff
add hashtag indexing
2021-12-14 12:37:10 +00:00
Alex Gleason
lain
Tusooa Zhu
a1batross
Mark Felder
FloatingGhost
Lain Soykaf
sadposter