Alex Gleason
|
a87b7b3046
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-02-01 09:31:58 -06:00 |
|
Alex Gleason
|
de99fd7804
|
Merge branch 'birth-dates' into 'develop'
Birthdays: Fix outgoing federation of birth dates
See merge request pleroma/pleroma!3626
|
2022-02-01 15:21:34 +00:00 |
|
|
|
f8f2a17754
|
Birthdays: Fix outgoing federation of birth dates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-01 12:00:26 +01:00 |
|
Alex Gleason
|
87ae63a12c
|
Merge branch 'merge-upstream' into 'develop'
InlineQuotePolicy: skip objects which already have an .inline-quote span
See merge request soapbox-pub/soapbox!88
|
2022-01-30 17:12:58 +00:00 |
|
Alex Gleason
|
93f5cd5c3b
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-01-30 10:58:18 -06:00 |
|
Alex Gleason
|
643f78cb22
|
InlineQuotePolicy: skip objects which already have an .inline-quote span
|
2022-01-30 10:57:29 -06:00 |
|
Alex Gleason
|
deff42f034
|
Merge remote-tracking branch 'origin/develop' into quote-post
|
2022-01-30 10:50:35 -06:00 |
|
Alex Gleason
|
5b0284da50
|
Merge branch 'merge-upstream' into 'develop'
Actually, don't send _misskey_quote anymore
See merge request soapbox-pub/soapbox!87
|
2022-01-29 01:13:25 +00:00 |
|
Alex Gleason
|
dde02e9806
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-01-28 17:53:56 -06:00 |
|
Alex Gleason
|
4883b996ad
|
Actually, don't send _misskey_quote anymore
|
2022-01-28 17:53:19 -06:00 |
|
Alex Gleason
|
d3b2faa67f
|
Merge branch 'merge-upstream' into 'develop'
Quote posts: improve Fedibird and Misskey compatibility
See merge request soapbox-pub/soapbox!86
|
2022-01-28 22:43:25 +00:00 |
|
Alex Gleason
|
281ccab704
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-01-28 16:21:37 -06:00 |
|
Alex Gleason
|
108997b764
|
InlineQuotePolicy: improve the way Markdown quotes are displayed by other software
|
2022-01-28 16:07:17 -06:00 |
|
Alex Gleason
|
b73a53ec69
|
Handle Fedibird's new quoteUri field
|
2022-01-28 15:55:52 -06:00 |
|
Alex Gleason
|
ac3426cbca
|
Transmogrifier: federate quotes with _misskey_quote field
|
2022-01-28 14:06:32 -06:00 |
|
Alex Gleason
|
053d23f065
|
Merge branch 'merge-upstream' into 'develop'
StatusView: return quote post inside a reblog
See merge request soapbox-pub/soapbox!85
|
2022-01-28 18:48:44 +00:00 |
|
Alex Gleason
|
ac6b2fadcf
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-01-28 12:34:34 -06:00 |
|
Alex Gleason
|
c4a4b508fa
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-01-28 12:34:28 -06:00 |
|
Alex Gleason
|
5134e691f4
|
StatusView: return quote post inside a reblog
|
2022-01-28 12:33:55 -06:00 |
|
Alex Gleason
|
64944c164f
|
Merge branch 'mention-mrf-md' into 'develop'
ForceMentionsInContent: improve display of Markdown posts
See merge request pleroma/pleroma!3625
|
2022-01-28 16:53:40 +00:00 |
|
Alex Gleason
|
65e8d42187
|
Merge branch 'inline-quote-default' into 'develop'
Add InlineQuotePolicy as a default MRF
See merge request soapbox-pub/soapbox!84
|
2022-01-27 21:04:11 +00:00 |
|
Alex Gleason
|
5371017fa7
|
Merge remote-tracking branch 'pleroma/quote-post' into inline-quote-default
|
2022-01-27 15:01:58 -06:00 |
|
Alex Gleason
|
a3d65937ab
|
Add InlineQuotePolicy as a default MRF
|
2022-01-27 15:01:20 -06:00 |
|
Alex Gleason
|
85ba0cb887
|
Merge branch 'merge-upstream' into 'develop'
Merge upstream
See merge request soapbox-pub/soapbox!83
|
2022-01-27 20:45:35 +00:00 |
|
Alex Gleason
|
a4d8e2bef7
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-01-27 14:31:04 -06:00 |
|
Alex Gleason
|
8d2f370a51
|
Merge remote-tracking branch 'pleroma/mention-mrf-md' into merge-upstream
|
2022-01-27 14:30:57 -06:00 |
|
Alex Gleason
|
3bc12b1011
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-01-27 14:30:51 -06:00 |
|
Alex Gleason
|
087e060d30
|
InlineQuotePolicy: don't add line breaks to markdown posts
|
2022-01-27 14:28:06 -06:00 |
|
Alex Gleason
|
3bf257171f
|
ForceMentionsInContent: improve display of Markdown posts
|
2022-01-27 14:15:06 -06:00 |
|
Alex Gleason
|
a146f6acab
|
Merge branch 'mentions-mrf-replies-only' into 'develop'
ForceMentionsInContent: don't apply it to top-level posts
See merge request pleroma/pleroma!3624
|
2022-01-27 19:57:28 +00:00 |
|
Alex Gleason
|
f72b9644c0
|
Merge branch 'merge-upstream' into 'develop'
Merge upstream
See merge request soapbox-pub/soapbox!82
|
2022-01-27 03:51:39 +00:00 |
|
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 |
|
