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
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
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
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
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
51dd5a6e21
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements
2022-01-24 17:18:30 -06: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
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
75c4fefb1c
Add a test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 13:03:00 +01:00
e3d394eef6
Birthdays: Fix tests, add test for misskey
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 09:41:21 +01:00
0266bc3c96
Birthdays: hide_birthday -> show_birthday
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-23 09:13:33 +01:00
Alex Gleason
d293265b06
Fix typos
2022-01-22 23:02:44 -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
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
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
acfded5ae8
MRF reasons: normalize config for backwards compatibility
2022-01-22 15:53:08 -06:00
Alex Gleason
e72fd4ceb6
SimplePolicy reasons: handle legacy config
2022-01-22 14:32:55 -06:00
Alex Gleason
aaa9314f4c
Merge remote-tracking branch 'origin/develop' into birth-dates
2022-01-22 14:24:50 -06:00
Alex Gleason
f91e06367d
EmailListTest: tag erratic tests
2022-01-22 14:12:46 -06:00
Alex Gleason
66e8c6f90f
Birthdays: birth_date --> birthday
2022-01-22 13:21:55 -06: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
04d12810bc
Merge remote-tracking branch 'pleroma/develop' into next
2022-01-22 12:32:54 -06:00
Alex Gleason
f5d4ef50b4
FilterTest: tag erratic test
2022-01-22 12:13:09 -06:00
Alex Gleason
cef7a9c181
Fix RichMedia.ParserTest
2022-01-22 11:52:28 -06:00
Alex Gleason
64f48c4239
Merge remote-tracking branch 'pleroma/develop' into next
2022-01-22 11:24:43 -06:00
Alex Gleason
6ffe43af70
Merge branch 'private-pins' into 'develop'
...
Support private pinned posts from Mastodon
See merge request pleroma/pleroma!3611
2022-01-20 23:18:24 +00:00
Alex Gleason
00523bdf5e
Test pinned private statuses in AccountController
2022-01-20 16:54:43 -06:00
88c21b9282
Support private pinned posts from Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-20 12:35:32 +01:00
NEETzsche
508c718f7c
Block notification policy
2022-01-19 21:02:03 +00:00
rinpatch
a02cfd7f52
Add ForceMentionsInContentPolicy
...
Even though latest PleromaFE supports displaying these properly, mobile
apps still exist, so I think we should offer a workaround to those who
want it.
2022-01-19 21:04:57 +03:00
dfb2808535
Birth dates: Add tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 23:15:31 +01:00
397f67fef8
Format code, expose instance configuration related to birth dates
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-18 18:18:38 +01:00
Alex Gleason
39c5ebb1f6
mix format
2022-01-15 12:55:12 -06:00
Alex Gleason
31148c1857
FormatterTest: fix nesting in expected output
2022-01-15 12:31:36 -06:00
Alex Gleason
db90c9e3b0
Merge remote-tracking branch 'mkfain/test-for-breaking-markdown' into linkify-0.5.2
2022-01-15 12:27:42 -06:00
eedf551eed
Add more tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 22:41:34 +01:00
0f90fd5805
WIP account endorsements
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-12 18:15:10 +01:00
rinpatch
fd043b0ab3
Escape unicode RTL overrides in rich media parser tests
...
Elixir 1.13 does not allow them in raw form anymore, resulting in errors
like this when running the test:
== Compilation error in file test/pleroma/web/rich_media/parser_test.exs ==
** (SyntaxError) test/pleroma/web/rich_media/parser_test.exs:136:45: invalid bidirectional formatting character in string: \u202C. If you want to use such character, use it in its escaped \u202C form instead
2022-01-10 17:51:53 +03:00
