|
|
fbb159dd47
|
Merge remote-tracking branch 'tusooa/from/develop/tusooa/emit-move' into emit-move
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-13 23:18:55 +01:00 |
|
marcin mikołajczak
|
a80852ba05
|
Merge branch 'instance-rules' into 'develop'
Instance rules
See merge request soapbox-pub/soapbox!93
|
2022-02-08 19:20:44 +00:00 |
|
|
|
1f9317100e
|
Instance rules: Duplicate rule_controller_test, hope nobody notices
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-08 20:06:32 +01:00 |
|
|
|
1ffed59ae9
|
Instance rules: Use render_many
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-07 23:41:41 +01:00 |
|
Alex Gleason
|
1abc29bf3a
|
Merge branch 'default-hellthread' into 'develop'
Add HellthreadPolicy by default
See merge request soapbox-pub/soapbox!91
|
2022-02-07 05:48:32 +00:00 |
|
Alex Gleason
|
44723db71a
|
Merge branch 'develop' into 'default-hellthread'
# Conflicts:
# config/soapbox.exs
|
2022-02-07 05:33:38 +00:00 |
|
Alex Gleason
|
bdf3f19396
|
Merge branch 'merge-upstream' into 'develop'
Max media attachment count
See merge request soapbox-pub/soapbox!94
|
2022-02-06 18:56:50 +00:00 |
|
Alex Gleason
|
a3c77c4eaa
|
Soapbox: limit 20 media attachments by default
|
2022-02-06 12:42:29 -06:00 |
|
Alex Gleason
|
502b63d8ea
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-02-06 12:31:53 -06:00 |
|
Alex Gleason
|
fa8e2ffa3f
|
Merge branch 'max_media_attachments' into 'develop'
Allow specifying max media attachment count
Closes #2665
See merge request pleroma/pleroma!3630
|
2022-02-06 18:25:14 +00:00 |
|
|
|
e473bcf7a0
|
Max media attachment count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-06 17:41:15 +01:00 |
|
|
|
d8a817ae8e
|
Add GET /api/v1/instance/rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-05 19:13:30 +01:00 |
|
|
|
6d18e6595c
|
Instance rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-05 18:07:04 +01:00 |
|
Alex Gleason
|
309e21a50f
|
Merge branch 'merge-upstream' into 'develop'
Merge upstream (test improvements)
See merge request soapbox-pub/soapbox!92
|
2022-02-02 20:12:17 +00:00 |
|
Alex Gleason
|
cc18296627
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-02-02 13:57:47 -06:00 |
|
Alex Gleason
|
64b136e11e
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-02-02 13:57:43 -06:00 |
|
Alex Gleason
|
60deddb7e5
|
Merge branch 'fix-tests-warn' into 'develop'
Fix tests matching on "warn"
See merge request pleroma/pleroma!3629
|
2022-02-02 19:57:03 +00:00 |
|
Alex Gleason
|
7c044a1841
|
FilterControllerTest: tag erratic test
|
2022-02-02 13:10:39 -06:00 |
|
Alex Gleason
|
6d710a0f7e
|
Merge remote-tracking branch 'origin/develop' into quote-post
|
2022-02-02 12:50:03 -06:00 |
|
Haelwenn (lanodan) Monnier
|
d1cc9e4eaf
|
Fix tests matching on "warn"
Moving it to "warning" would break tests on 1.12.x
|
2022-02-02 12:45:26 -06:00 |
|
Alex Gleason
|
71c80204c9
|
Merge branch 'roadhouse' into 'develop'
Roadhouse debugging
See merge request pleroma/pleroma!3628
|
2022-02-02 18:44:09 +00:00 |
|
Alex Gleason
|
bd81af731e
|
Tag erratic test
|
2022-02-02 12:29:53 -06:00 |
|
Alex Gleason
|
2d77976305
|
Add tests for mismatched context in replies
|
2022-02-02 12:19:35 -06:00 |
|
Alex Gleason
|
5a4e3aa715
|
Test that a Create/Note from Roadhouse validates
|
2022-02-02 11:02:23 -06:00 |
|
Alex Gleason
|
61dfeca1cc
|
Test that a Note from Roadhouse validates
|
2022-02-02 10:38:30 -06:00 |
|
Alex Gleason
|
94838fc10a
|
Add HellthreadPolicy by default
|
2022-02-01 15:28:53 -06:00 |
|
Alex Gleason
|
d683d6d4f3
|
Merge branch 'merge-upstream' into 'develop'
Birthdays: Fix outgoing federation of birth dates
See merge request soapbox-pub/soapbox!89
|
2022-02-01 15:47:43 +00:00 |
|
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 |
|
