Commit graph

14450 commits

Author SHA1 Message Date
0c0ea169d4 Merge remote-tracking branch 'upstream/develop' into develop 2021-12-16 16:10:08 +00:00
3a9b83413e Merge branch 'develop' into feature/elasticsearch 2021-12-16 16:07:15 +00:00
f3d9c58fef Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2021-12-16 16:07:00 +00:00
742b86fdaa format 2021-12-16 16:05:33 +00:00
9134ef5ecb add timestamp 2021-12-16 16:05:18 +00:00
2152832780 add timestamp 2021-12-16 15:58:56 +00:00
26cae62c7f maybe 2021-12-16 15:20:34 +00:00
9d4727598d fix remote hashtags 2021-12-16 15:20:34 +00:00
1745606ab5 maybe 2021-12-16 15:20:22 +00:00
418212c71c fix remote hashtags 2021-12-16 15:09:36 +00:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard 2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
lain
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
Lain Soykaf
4e98ba3c3a Application: Actually start finch if it's needed 2021-12-15 15:42:37 -05:00
Lain Soykaf
abb62dd886 Application, dependencies: prepare for finch 2021-12-15 13:53:09 -05:00
sadposter
25920c10df don't try indexing non-people 2021-12-15 11:08:13 +00:00
sadposter
93e41df75d don't try indexing non-people 2021-12-15 11:05:30 +00:00
ccc5c59c50 re-add fetching by url 2021-12-15 10:58:09 +00:00
d5c8415496 re-add fetching by url 2021-12-15 10:57:47 +00:00
sadposter
c50ad91d31 fix empty queries returning 50 results 2021-12-14 15:02:48 +00:00
sadposter
7f30218b82 extra cool 2021-12-14 15:02:48 +00:00
sadposter
d1bb10c88e fix empty queries returning 50 results 2021-12-14 15:02:11 +00:00
sadposter
8378c3a8bc extra cool 2021-12-14 14:48:24 +00:00
0d7bbee430 add timeouts 2021-12-14 14:35:46 +00:00
bed6f4e12c add timeouts 2021-12-14 14:33:34 +00:00
9d5d964bf8 merge 2021-12-14 14:28:15 +00:00
sadposter
cc4c5f22f4 fix inbound federation 2021-12-14 14:27:42 +00:00
sadposter
94c22baaa3 filter by user type 2021-12-14 14:16:21 +00:00
sadposter
8f78cb3050 Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop 2021-12-14 14:01:09 +00:00
sadposter
5d901c337e fix inbound federation 2021-12-14 13:58:16 +00:00
703f53c08f Search through users and hashtags as well 2021-12-14 13:55:14 +00:00
a85bf5929b add hashtag indexing 2021-12-14 13:55:14 +00:00
6ca70833f5 add user import 2021-12-14 13:55:14 +00:00
0b5206015b add mappings 2021-12-14 13:55:14 +00:00
c03e8d46e8 Search through users and hashtags as well 2021-12-14 13:53:46 +00:00
8547cefaff add hashtag indexing 2021-12-14 12:37:10 +00:00
Alex Gleason
8672ad6b00
TwitterAPI: allow deleting one's own account with request body 2021-12-13 17:07:29 -05:00
6bb19454fd add user import 2021-12-13 20:27:35 +00:00
72e22a6dae add mappings 2021-12-13 20:15:17 +00:00
Alex Gleason
108dfd1f87
Search: limit number of results 2021-12-12 22:50:07 -06:00
sadposter
06ab00d625 fix buggos 2021-12-12 20:12:06 +00:00
a504e250a9 fully reference es 2021-12-12 20:12:06 +00:00
71126fea0c fix multi-after-transaction 2021-12-12 20:12:06 +00:00
dbdf0c005e pipeline it 2021-12-12 20:12:06 +00:00
sadposter
ef9dea66b2 fix bug in inbound 2021-12-12 20:12:06 +00:00
sadposter
e835212a7d enforce visibility 2021-12-12 20:12:06 +00:00
sadposter
144c06487a fix buggos 2021-12-12 20:01:07 +00:00
ee1a2fc451 fully reference es 2021-12-12 19:40:31 +00:00
67f8bdce4f fix multi-after-transaction 2021-12-12 19:40:05 +00:00
7502da993b pipeline it 2021-12-12 19:39:07 +00:00