|
|
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 |
|
|
|
02f02cb6df
|
Add configuration field to /api/v1/instance
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-15 22:03:49 +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 |
|
|
|
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
|
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 |
|
|
|
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
|
a87b7b3046
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-02-01 09:31:58 -06: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
|
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
|
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 |
|
bot
|
a4de79ced0
|
ForceBotUnlistedPolicy: fix to stop unlisting my posts >:(
|
2022-01-26 22:53:02 +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
|
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 |
|
|
|
c1ae35ff2c
|
Fix show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 17:04:41 +01:00 |
|
