lain
|
879304dcd9
|
Merge branch 'replies-domain-block' into 'develop'
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
|
4 years ago |
|
lain
|
5da38c15cd
|
Merge branch 'openapi/admin/oauth-apps' into 'develop'
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
|
4 years ago |
|
lain
|
022d975a39
|
Merge branch 'openapi/admin/invites' into 'develop'
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
|
4 years ago |
|
lain
|
cd2abcc0e3
|
Merge branch 'fix/invisible-repeats' into 'develop'
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
|
4 years ago |
|
rinpatch
|
165a4b2a69
|
Do not include activities of invisible users unless explicitly requested
Closes #1833
|
4 years ago |
|
lain
|
d111eae798
|
Merge branch 'feature/status-by-id-account-view' into 'develop'
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
|
4 years ago |
|
Alexander Strizhakov
|
19f468c5bc
|
replies filtering for blocked domains
|
4 years ago |
|
rinpatch
|
6fb900a496
|
Merge branch 'user-updates' into 'develop'
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
|
4 years ago |
|
Alexander Strizhakov
|
7e6ec778d9
|
exclude replies on blocked domains
|
4 years ago |
|
lain
|
d4d4b92f75
|
TimelineController: Only return `Create` in public timelines.
|
4 years ago |
|
lain
|
9460983032
|
AccountController: Federate user account changes.
Hotfixy commit, will be moved to the pipeline.
|
4 years ago |
|
lain
|
b004c427a0
|
Merge branch 'conversation-pagination' into 'develop'
Conversation pagination
See merge request pleroma/pleroma!2601
|
4 years ago |
|
Steven Fuchs
|
6d4b80822b
|
Conversation pagination
|
4 years ago |
|
Roman Chvanikov
|
0a83af330b
|
fix unused var warning
|
4 years ago |
|
kPherox
|
9ca978494f
|
Add test for stream boosts of mastodon user
|
4 years ago |
|
lain
|
9848978109
|
Merge branch 'fix-relay-repeat-notification' into 'develop'
Fix relay repeat notification
See merge request pleroma/pleroma!2590
|
4 years ago |
|
rinpatch
|
396bc69aee
|
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
|
4 years ago |
|
lain
|
f6ddf0cc50
|
Merge branch 'feature/1792-update-actor-type' into 'develop'
Validate actor type
See merge request pleroma/pleroma!2593
|
4 years ago |
|
rinpatch
|
8f6d428880
|
AccountView: Use mediaproxy URLs for emojis
Also use atom keys in emoji maps instead of binaries
Closes #1810
|
4 years ago |
|
rinpatch
|
78c46fb7ba
|
MediaProxy test: use config macros instead of directly putting values
They were not properly cleaned later and caused trouble for another tests
|
4 years ago |
|
kPherox
|
48fd9be65a
|
Exclude post actor from to of relay announce
|
4 years ago |
|
rinpatch
|
d35be02e70
|
Merge branch 'refactor-add-mention-step-one' into 'develop'
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
|
4 years ago |
|
Alexander Strizhakov
|
3249141588
|
validate actor type
|
4 years ago |
|
rinpatch
|
3601c0015c
|
Merge branch '1808-pleroma-sucks' into 'develop'
Resolve "Don't fail message ingestions when we can't update a user"
Closes #1808
See merge request pleroma/pleroma!2576
|
4 years ago |
|
Egor Kislitsyn
|
fca48154a2
|
Add AdminAPI.InviteView
|
4 years ago |
|
Egor Kislitsyn
|
2a4f965191
|
Add OpenAPI spec for AdminAPI.InviteTokenController
|
4 years ago |
|
Egor Kislitsyn
|
95ebfb9190
|
Move invite actions to AdminAPI.InviteTokenController
|
4 years ago |
|
Alexander Strizhakov
|
8f08384d80
|
another view for account in admin-fe status_show
|
4 years ago |
|
Ivan Tashkinov
|
d7a57004ef
|
[#1501] Made user feed contain public and unlisted activities.
|
4 years ago |
|
Egor Kislitsyn
|
0ba1f2631a
|
Add OpenAPI spec for AdminAPI.OAuthAppContoller
|
4 years ago |
|
lain
|
6bd7070b00
|
Transmogrifier: Use a simpler way to get mentions.
|
4 years ago |
|
lain
|
f20dff451e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
|
4 years ago |
|
lain
|
5d5db7e5b7
|
StealEmojiPolicyTest: Clean up.
|
4 years ago |
|
lain
|
2dff376041
|
StealEmojiPolicyTest: Fix flaky test.
|
4 years ago |
|
lain
|
aeb0875025
|
StealEmojiPolicyTest: Fix flaky test.
|
4 years ago |
|
lain
|
ec470c4c77
|
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566
|
4 years ago |
|
lain
|
d0c26956da
|
User: Don't error out if we want to refresh a user but can't
|
4 years ago |
|
rinpatch
|
7bc2ec0aa2
|
Merge branch 'mastodon-migration-compat' into 'develop'
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
|
4 years ago |
|
lain
|
ddbbefeb2e
|
Merge branch 'feature/configure-filename-truncate' into 'develop'
Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573
|
4 years ago |
|
Roman Chvanikov
|
cc82229ba7
|
Add filename_display_max_length config
|
4 years ago |
|
lain
|
91c8467582
|
OStatusController: Add Mastodon activity compat route.
|
4 years ago |
|
lain
|
355aa3bdc7
|
ActivityPubController: Add Mastodon activity compat route.
|
4 years ago |
|
lain
|
8a4bd9e5d1
|
OStatusController: Add Mastodon compatibility route for objects.
|
4 years ago |
|
rinpatch
|
1fa7aa9fc5
|
Merge branch 'emoji-react-better-errors' into 'develop'
EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569
|
4 years ago |
|
Egor Kislitsyn
|
ba106aa9c8
|
Fix notifications mark as read API
|
4 years ago |
|
lain
|
ca755f9a73
|
ActivityPubController: Add Mastodon compatibility route.
|
4 years ago |
|
lain
|
bcb549531f
|
EmojiReactionController: Return more appropriate error.
|
4 years ago |
|
Haelwenn
|
7b02bfca51
|
Merge branch 'announce-validator' into 'develop'
Announce validator
See merge request pleroma/pleroma!2567
|
4 years ago |
|
Haelwenn
|
a57e7f3503
|
Merge branch '1113-op-mentioning' into 'develop'
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
|
4 years ago |
|
lain
|
a42a0716ec
|
Merge branch 'features/emoji_stealer' into 'develop'
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
|
4 years ago |
