|
|
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 |
|
|
|
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 |
|
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 |
|
sadposter
|
f341e68622
|
fix bug in inbound
|
2021-12-12 19:31:47 +00:00 |
|
sadposter
|
23c758bbe7
|
enforce visibility
|
2021-12-12 18:25:20 +00:00 |
|
|
|
0fbf7faf85
|
Remove IO inspect
|
2021-12-12 17:35:35 +00:00 |
|
|
|
de60b1f3c1
|
make search provider configurable
|
2021-12-12 17:35:35 +00:00 |
|
|
|
fce13cce46
|
add extra filters
|
2021-12-12 17:35:35 +00:00 |
|
|
|
449d8ff165
|
integrate search endpoint with ES
|
2021-12-12 17:35:35 +00:00 |
|
|
|
9002e5155b
|
Add import functionality
|
2021-12-12 17:35:35 +00:00 |
|
Alex Gleason
|
da83839dc1
|
AttachmentValidator: ingest width and height
|
2021-12-12 17:35:02 +00:00 |
|
Lain Soykaf
|
eb7bbe3fc8
|
Linting.
|
2021-12-12 17:35:02 +00:00 |
|
Finn Behrens
|
66b60f1ee2
|
move result into with guard
|
2021-12-12 17:35:02 +00:00 |
|
|
|
0fab887eee
|
make linter happy
|
2021-12-12 17:35:02 +00:00 |
|
|
|
47833e31ad
|
Remove IO inspect
|
2021-12-12 17:26:06 +00:00 |
|
|
|
ed3a866f94
|
make search provider configurable
|
2021-12-12 17:23:44 +00:00 |
|
marcin mikołajczak
|
dff435488d
|
Add link headers in ChatController.index2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-12 17:43:18 +01:00 |
|
|
|
345eb7b3f8
|
add extra filters
|
2021-12-11 19:56:15 +00:00 |
|
|
|
3478492945
|
integrate search endpoint with ES
|
2021-12-11 18:48:46 +00:00 |
|
|
|
c684265585
|
Add import functionality
|
2021-12-11 17:36:49 +00:00 |
|
Alex Gleason
|
2c96668a2c
|
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
|
2021-12-07 13:41:54 -05:00 |
|
Alex Gleason
|
3f03d71ea6
|
AttachmentValidator: ingest width and height
|
2021-12-07 12:59:03 -05:00 |
|
Lain Soykaf
|
ca8c676867
|
Linting.
|
2021-12-07 12:12:23 -05:00 |
|
Finn Behrens
|
8af53101fb
|
move result into with guard
|
2021-12-07 09:18:53 +01:00 |
|
marcin mikołajczak
|
c96e52b88c
|
Add 'notifying' to relationship for compatibility with Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-06 21:24:12 +01:00 |
|
marcin mikołajczak
|
64a4c147b1
|
MastoAPI: accept notify param in follow request
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-06 19:36:58 +01:00 |
|
sadposter
|
6a6260f64e
|
re-enable deactivated check
|
2021-12-06 12:03:16 +00:00 |
|
|
|
db46913dcc
|
make linter happy
|
2021-12-06 11:50:51 +00:00 |
|
|
|
cd8bdbc761
|
Make deactivated user check into a subquery
Fixes #2792
|
2021-12-06 11:44:17 +00:00 |
|
sadposter
|
ca2bd8b72b
|
remove deactivated_users call
|
2021-12-06 10:18:16 +00:00 |
|
Alex Gleason
|
949a53e327
|
Log Ecto queries > 500ms
|
2021-12-05 18:29:33 -05:00 |
|
sadposter
|
bb54720778
|
add debug
|
2021-12-05 21:56:11 +00:00 |
|
sadposter
|
c85b278f1e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-12-05 15:01:23 +00:00 |
|
Alex Gleason
|
8286ceb465
|
Merge remote-tracking branch 'origin/develop' into password-reset
|
2021-12-03 00:11:38 -06:00 |
|
Alex Gleason
|
5da4f33bf1
|
Restore POST /auth/password
|
2021-12-03 00:10:57 -06:00 |
|
marcin mikołajczak
|
cd5fb84b76
|
remote_interaction API endpoint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-02 16:08:44 +01:00 |
|
Alex Gleason
|
6519f59d91
|
v2 Suggestions: return is_suggested through the API
|
2021-11-26 23:10:01 -06:00 |
|
Alex Gleason
|
8dc1d2201a
|
Instance: add v2_suggestions feature
|
2021-11-26 22:45:49 -06:00 |
|
Alex Gleason
|
e5a7547fbe
|
v2 Suggestions: also filter out users you follow
|
2021-11-26 21:46:08 -06:00 |
|
Alex Gleason
|
437c1a5a52
|
v2 Suggestions: actually flter out dismissed suggestions
|
2021-11-26 21:09:37 -06:00 |
|
Alex Gleason
|
aee55b9a8b
|
v2 Suggestions: dismiss a suggestion
|
2021-11-26 20:19:29 -06:00 |
|
Alex Gleason
|
6c0484d571
|
AdminAPI: suggest a user through the API
|
2021-11-26 15:19:01 -06:00 |
|
Alex Gleason
|
e28d990ecb
|
v2 Suggestions: don't skip visibility check
|
2021-11-26 14:46:29 -06:00 |
|
Alex Gleason
|
b17360cd7c
|
v2 Suggestions: rudimentary API response
|
2021-11-26 14:34:10 -06:00 |
|
Alex Gleason
|
7e1caddc58
|
v2 Suggestions: return empty array
|
2021-11-25 14:57:36 -06:00 |
|
Alex Gleason
|
720198d569
|
Merge remote-tracking branch 'pleroma/develop' into manifest
|
2021-11-24 17:58:58 -06:00 |
|
Alex Gleason
|
cb9359335f
|
Expose /manifest.json for PWA
|
2021-11-24 17:50:55 -06:00 |
|
marcin mikołajczak
|
d64d1b1d45
|
Fix replies count for remote replies
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-23 11:31:09 +01:00 |
|
rinpatch
|
588bcbac55
|
Apply 2 suggestion(s) to 2 file(s)
|
2021-11-22 10:54:44 +00:00 |
|
marcin mikołajczak
|
8e040e098b
|
Lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 18:17:06 +01:00 |
|
marcin mikołajczak
|
106b5c2678
|
Fix a typo
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 17:36:37 +01:00 |
|
marcin mikołajczak
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 16:56:26 +01:00 |
|
sadposter
|
a61207cf8f
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-11-19 13:43:24 +00:00 |
|
|
|
04aca335aa
|
nodeinfo: report activeMonth and activeHalfyear users fields
|
2021-11-15 17:01:30 +01:00 |
|
lain
|
e2772d6bf1
|
Merge branch 'block-behavior' into 'develop'
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
|
2021-11-15 14:27:59 +00:00 |
|
