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
|
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 |
|
Alex Gleason
|
4f51c41f9f
|
@context: add quoteUrl
|
2022-01-22 23:29:55 -06:00 |
|
Alex Gleason
|
c22b354587
|
InstanceView: add "quote_posting" feature
|
2022-01-22 23:09:33 -06:00 |
|
Alex Gleason
|
d293265b06
|
Fix typos
|
2022-01-22 23:02:44 -06:00 |
|
Alex Gleason
|
c13ccb0f84
|
mix format
|
2022-01-22 22:57:42 -06:00 |
|
Alex Gleason
|
00b2dc7ecb
|
TransmogrifierTest: prepare an outgoing quote post
|
2022-01-22 22:41:57 -06:00 |
|
Alex Gleason
|
bbd3433f5a
|
StatusControllerTest: test creating a quote post
|
2022-01-22 22:35:08 -06:00 |
|
Alex Gleason
|
4b2fe550de
|
BuilderTest: build quote post
|
2022-01-22 22:29:13 -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
|
77368c1896
|
Merge branch 'merge-upstream' into 'develop'
Merge upstream
See merge request soapbox-pub/soapbox!73
|
2022-01-23 02:45:03 +00: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
|
0453713c70
|
Quote post: add fixtures
|
2022-01-22 17:30:49 -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
|
604e705bde
|
Merge branch 'email-list-tests-erratic' into 'develop'
EmailListTest: tag erratic tests
See merge request soapbox-pub/soapbox!71
|
2022-01-22 20:33:26 +00:00 |
|
Alex Gleason
|
e72fd4ceb6
|
SimplePolicy reasons: handle legacy config
|
2022-01-22 14:32:55 -06:00 |
|
Alex Gleason
|
f91e06367d
|
EmailListTest: tag erratic tests
|
2022-01-22 14:12:46 -06:00 |
|
Alex Gleason
|
9983799ccb
|
Merge branch 'less_erratic_expiration_test' into 'develop'
Make test less erratic by adding five second tolerance
See merge request pleroma/pleroma!3614
|
2022-01-22 20:09:09 +00:00 |
|
Alex Gleason
|
4ac36ad19d
|
Merge branch 'next' into 'develop'
Merge Pleroma's develop branch
See merge request soapbox-pub/soapbox!67
|
2022-01-22 19:08:14 +00:00 |
|
NEETzsche
|
7a015b1fe2
|
Make test less erratic by adding five second tolerance
|
2022-01-22 12:07:54 -07:00 |
|
Alex Gleason
|
263b42a73d
|
Merge branch 'apple_autofill_suggestions' into 'develop'
Add autocompelete values suggested by Apple
See merge request pleroma/pleroma!3612
|
2022-01-22 18:38:03 +00:00 |
|
Alex Gleason
|
04d12810bc
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2022-01-22 12:32:54 -06:00 |
|
Alex Gleason
|
78c6aeee1b
|
Merge branch 'erratic-filter-test' into 'develop'
FilterTest: tag erratic test
See merge request pleroma/pleroma!3613
|
2022-01-22 18:32:34 +00:00 |
|
