Alex Gleason
|
1db95a1677
|
SideEffects: don't stream Create/ChatMessage in an 'update' event
|
2022-02-28 14:56:20 -06:00 |
|
Alex Gleason
|
4bdd365b6f
|
Merge branch 'merge-upstream' into 'develop'
Add unicode 14 support
See merge request soapbox-pub/soapbox-be!102
|
2022-02-24 17:42:46 +00:00 |
|
Alex Gleason
|
16745b8e91
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-02-24 12:28:23 -05:00 |
|
Sam Therapy
|
061cb749cd
|
Add unicode 14 support
and add a test with a unicode 14 emoji
|
2022-02-21 12:28:33 -06:00 |
|
|
|
e4677e212c
|
Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-17 15:28:25 +01:00 |
|
Alex Gleason
|
0a6c52fecb
|
Merge branch 'configuration' into 'develop'
Add `configuration` field to /api/v1/instance
See merge request soapbox-pub/soapbox-be!98
|
2022-02-16 20:24:48 +00:00 |
|
|
|
892f75e9d7
|
InstanceControllerTest: Add configuration test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-16 20:41:36 +01:00 |
|
|
|
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 |
|
|
|
5a4a7e775b
|
some cleanup, reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-13 17:58:24 +01:00 |
|
|
|
ca5ee8f0bf
|
MastoAPI: /api/v1/admin/reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-12 21:52:21 +01:00 |
|
|
|
48e87be7de
|
Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api
|
2022-02-11 22:53:22 +01:00 |
|
|
|
6836361398
|
MastoAPI: /api/v1/admin/accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-11 22:36:00 +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 |
|
Alex Gleason
|
502b63d8ea
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-02-06 12:31:53 -06:00 |
|
|
|
e473bcf7a0
|
Max media attachment count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-06 17:41:15 +01:00 |
|
|
|
6d18e6595c
|
Instance rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-05 18:07:04 +01: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
|
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
|
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
|
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
|
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
|
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
|
ac6b2fadcf
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-01-28 12:34:34 -06:00 |
|
Alex Gleason
|
5134e691f4
|
StatusView: return quote post inside a reblog
|
2022-01-28 12:33:55 -06: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
|
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
|
436f62781b
|
Merge remote-tracking branch 'pleroma/mentions-mrf-replies-only' into merge-upstream
|
2022-01-26 21:29:17 -06:00 |
|
Alex Gleason
|
27cb3d6273
|
ForceMentionsInContent: don't apply it to top-level posts
|
2022-01-26 21:24:26 -06: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 |
|
