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 |
|
Alex Gleason
|
2bab9dd175
|
Merge branch 'fix-bot-policy' into 'develop'
ForceBotUnlistedPolicy: fix to stop unlisting my posts >:(
See merge request pleroma/pleroma!3623
|
2022-01-26 23:25:58 +00:00 |
|
bot
|
a4de79ced0
|
ForceBotUnlistedPolicy: fix to stop unlisting my posts >:(
|
2022-01-26 22:53:02 +00:00 |
|
Alex Gleason
|
e31e579ec5
|
Merge branch 'quote-visibility-fixes' into 'develop'
Quote visibility fixes
See merge request soapbox-pub/soapbox!81
|
2022-01-26 18:19:37 +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
|
8951be7710
|
Merge branch 'inline-mention-self' into 'develop'
ForceMentionsInContent: don't mention self
See merge request pleroma/pleroma!3622
|
2022-01-25 21:49:33 +00:00 |
|
Alex Gleason
|
f0289bf4fe
|
Merge branch 'inline-mention-self' into 'develop'
ForceMentionsInContent: don't mention self
See merge request soapbox-pub/soapbox!80
|
2022-01-25 18:51:27 +00: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
|
591b5d130b
|
Merge branch 'merge-upstream' into 'develop'
Merge upstream
See merge request soapbox-pub/soapbox!79
|
2022-01-25 17:17:23 +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
|
2fe5cbce24
|
Merge branch 'merge-upstream' into 'develop'
Birth dates, birthday reminders API, allow instance admins to require minimum age
See merge request soapbox-pub/soapbox!78
|
2022-01-25 15:54:23 +00: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 |
|
|
|
249fe88d12
|
Birthdays: users_birthday_month_day_index
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 11:49:42 +01:00 |
|
Alex Gleason
|
af2e411f2e
|
Merge branch 'recipients-inline' into 'develop'
ForceMentionsInContent: wrap mentions in a span, fix the formatting
See merge request soapbox-pub/soapbox!77
|
2022-01-25 02:40:34 +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
|
4418f2a494
|
Merge branch 'quote-improvements' into 'develop'
Add InlineQuotePolicy MRF
See merge request soapbox-pub/soapbox!76
|
2022-01-24 23:38:42 +00:00 |
|
Alex Gleason
|
51dd5a6e21
|
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements
|
2022-01-24 17:18:30 -06:00 |
|
Alex Gleason
|
0e2533c17c
|
Merge branch 'merge-upstream' into 'develop'
Merge Pleroma upstream
See merge request soapbox-pub/soapbox!75
|
2022-01-24 23:15:30 +00: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
|
cd9341dbff
|
Scrubber.Default: allow span.quote-inline for quote post compatibility
|
2022-01-24 15:34:23 -06:00 |
|
Alex Gleason
|
19d557c870
|
Merge branch 'revert-6e27fc9c' into 'develop'
Revert "Merge branch 'log-slow-queries' into 'develop'"
See merge request pleroma/pleroma!3619
|
2022-01-24 19:06:33 +00: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
|
4c415e5e02
|
Merge branch 'quote-post' into 'develop'
Quote post
See merge request soapbox-pub/soapbox!74
|
2022-01-23 22:45:22 +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 |
|
Alex Gleason
|
7b87cac6cc
|
Merge branch 'preserve-mentions-order' into 'develop'
Preserve order of mentioned users
See merge request pleroma/pleroma!3617
|
2022-01-23 15:23:56 +00:00 |
|
|
|
75c4fefb1c
|
Add a test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 13:03:00 +01:00 |
|
|
|
1dba3bc4dc
|
Preserve order of mentioned users
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 12:29:01 +01:00 |
|
