Commit graph

8663 commits

Author SHA1 Message Date
Alex Gleason
436f62781b
Merge remote-tracking branch 'pleroma/mentions-mrf-replies-only' into merge-upstream 2022-01-26 21:29:17 -06:00
Alex Gleason
392306a4fc
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-26 21:29:05 -06:00
Alex Gleason
27cb3d6273
ForceMentionsInContent: don't apply it to top-level posts 2022-01-26 21:24:26 -06:00
bot
a4de79ced0 ForceBotUnlistedPolicy: fix to stop unlisting my posts >:( 2022-01-26 22:53:02 +00:00
Alex Gleason
f73edd02f0
Merge remote-tracking branch 'pleroma/quote-post' into quote-visibility-fixes 2022-01-26 11:59:55 -06:00
Alex Gleason
91822c383c
StatusView: add quote_visible param 2022-01-26 11:52:50 -06:00
Alex Gleason
660490c2ec
StatusView: fix quote visibility 2022-01-26 11:49:31 -06:00
Alex Gleason
5a1fa6bca2
CommonAPI: disallow quoting private posts through the API 2022-01-26 11:21:49 -06:00
Alex Gleason
f0c22f9bd7
Merge remote-tracking branch 'pleroma/inline-mention-self' into inline-mention-self 2022-01-25 12:36:56 -06:00
Alex Gleason
0604b0dd09
ForceMentionsInContent: don't mention self 2022-01-25 12:33:47 -06:00
Alex Gleason
93a340668f
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-25 11:57:04 -06:00
Alex Gleason
0f4e0e667e Merge branch 'recipients-inline' into 'develop'
ForceMentionsInContent: wrap mentions in a span, fix the formatting

See merge request pleroma/pleroma!3620
2022-01-25 17:43:39 +00:00
Alex Gleason
1e740bf6d3
Merge remote-tracking branch 'pleroma/recipients-inline' into merge-upstream 2022-01-25 11:02:07 -06:00
Alex Gleason
440754d526
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-25 11:01:59 -06:00
Alex Gleason
99e9c2c668 Merge branch 'birth-dates' into 'develop'
Fix show_birthday

See merge request pleroma/pleroma!3621
2022-01-25 16:59:07 +00:00
Alex Gleason
65b4d2ce84
ForceMentionsInContent: fix order of mentions 2022-01-25 10:42:34 -06:00
ab12a05a43 AccountView: Add test for show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 17:34:36 +01:00
c1ae35ff2c Fix show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 17:04:41 +01:00
Alex Gleason
25786c804b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-25 09:39:25 -06:00
Alex Gleason
dd7977bb68 Merge branch 'birth-dates' into 'develop'
Birth dates

See merge request pleroma/pleroma!3608
2022-01-25 15:35:47 +00:00
Alex Gleason
6bc109b31d
Merge remote-tracking branch 'pleroma/recipients-inline' into recipients-inline 2022-01-24 20:20:04 -06:00
Alex Gleason
267184b70e
ForceMentionsInContentTest: return mentions in a not terrible format 2022-01-24 20:03:43 -06:00
Alex Gleason
c5a20c80c4
ForceMentionsInContent: simplify finding users 2022-01-24 19:44:44 -06:00
Alex Gleason
d5644a52aa
ForceMentionsInContent: wrap inline mentions with span tag 2022-01-24 19:11:45 -06:00
Alex Gleason
1bbc701a3a
ForceMentionsInContent: use to instead of tag 2022-01-24 19:11:14 -06:00
Alex Gleason
51dd5a6e21
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements 2022-01-24 17:18:30 -06:00
Alex Gleason
7f1d82a523
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-24 16:55:39 -06:00
Alex Gleason
1cb8326cfb
Merge remote-tracking branch 'origin/develop' into quote-post 2022-01-24 16:48:37 -06:00
Alex Gleason
0571f8f553
Add InlineQuotePolicy to force quote URLs inline 2022-01-24 16:44:35 -06:00
Alex Gleason
53de3a9d44 Revert "Merge branch 'log-slow-queries' into 'develop'"
This reverts merge request !3553
2022-01-24 18:54:43 +00:00
Alex Gleason
683f96da00
Merge remote-tracking branch 'pleroma/quote-post' into quote-post 2022-01-23 16:10:36 -06:00
Alex Gleason
c04241eb4a
ActivityDraft: mix format, defensive actor ID 2022-01-23 16:03:46 -06:00
Alex Gleason
d39ccd8372
ActivityDraft: mention the OP of a quoted post 2022-01-23 15:46:44 -06:00
Alex Gleason
d903a6b85d
Return quote_url through the API, don't render quotes more than 1 level deep 2022-01-23 13:55:25 -06:00
1dba3bc4dc Preserve order of mentioned users
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 12:29:01 +01:00
0266bc3c96 Birthdays: hide_birthday -> show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 09:13:33 +01:00
Alex Gleason
c22b354587
InstanceView: add "quote_posting" feature 2022-01-22 23:09:33 -06:00
Alex Gleason
c13ccb0f84
mix format 2022-01-22 22:57:42 -06:00
Alex Gleason
69cab8da89
ActivityDraft: allow quoting 2022-01-22 22:15:54 -06:00
Alex Gleason
870023e286
ActivityDraft: create quote posts 2022-01-22 21:27:05 -06:00
Alex Gleason
62c27425d7
Merge remote-tracking branch 'pleroma/mrf-tuples-fix' into merge-upstream 2022-01-22 20:24:14 -06:00
Alex Gleason
06aa38447b
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-01-22 20:24:04 -06:00
Alex Gleason
d4e9cb600d
StatusView: render the whole quoted status 2022-01-22 20:05:58 -06:00
Alex Gleason
0584a6f131
StatusView: show quoted posts through the API, probably 2022-01-22 19:47:08 -06:00
Alex Gleason
04709e1a27
Transmogrifier: fix quoteUrl here too 2022-01-22 19:14:39 -06:00
Alex Gleason
fbdfeb326d
Transmogrifier: fetch quoted post 2022-01-22 18:46:58 -06:00
Alex Gleason
0f34eb60d4
ObjectValidators: improve quoteUrl compatibility 2022-01-22 18:03:22 -06:00
Alex Gleason
c6ff668b1d
ObjectValidators: accept "quoteUrl" field 2022-01-22 16:41:51 -06:00
Alex Gleason
acfded5ae8
MRF reasons: normalize config for backwards compatibility 2022-01-22 15:53:08 -06:00
Alex Gleason
e72fd4ceb6
SimplePolicy reasons: handle legacy config 2022-01-22 14:32:55 -06:00