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
lain
8e1db6a835
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
af9090238e
CommonAPI: Newlines -> br for chat messages.
4 years ago
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
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
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
8bdf18d7c1
CommonAPI: Linkify chat messages.
4 years ago
lain
2c9465cc51
SafeText: Let through basic html.
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
Ivan Tashkinov
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
4 years ago
Ivan Tashkinov
78c80a261a
Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
4 years ago
Roman Chvanikov
0a83af330b
fix unused var warning
4 years ago
Ivan Tashkinov
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
4 years ago
kPherox
9ca978494f
Add test for stream boosts of mastodon user
4 years ago
Haelwenn (lanodan) Monnier
a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
4 years ago
Haelwenn (lanodan) Monnier
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain
863c02b25d
SideEffects: Stream out chat messages.
4 years ago
lain
c86a88edec
Streamer: Add a chat message stream.
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
lain
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
Egor Kislitsyn
06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
4 years ago
Egor Kislitsyn
d1ee3527ef
Move config actions to AdminAPI.ConfigController
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
Mark Felder
9eea800026
Refactor notification settings
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
dbd07d29a3
Streamer: Don't crash on streaming chat notifications
4 years ago
lain
2c25087d20
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
6bd7070b00
Transmogrifier: Use a simpler way to get mentions.
4 years ago
Egor Kislitsyn
cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
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
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
578ed3a37f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
lain
f166316f50
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
...
Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564
4 years ago
Egor Kislitsyn
45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
4 years ago
lain
cc0d462e91
Attachments: Have the mediaType on the root, too.
4 years ago
lain
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
bf1b221f94
Credo fixes for the credo god.
4 years ago
lain
cdc6ba8d7b
AnnounceValidator: Check for announcability
4 years ago
lain
c76267afb9
Credo fixes.
4 years ago
lain
23e248694d
Announcements: Fix all tests.
4 years ago
lain
d9d425708e
SideEffects: Builed out Announce effects.
4 years ago
Egor Kislitsyn
9de9760aa6
Move status actions to AdminAPI.StatusController
4 years ago
Ivan Tashkinov
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain
39031f4860
Pipeline: Don't federate if federation is disabled.
4 years ago
lain
e42bc5f557
Announcements: Handle through common pipeline.
4 years ago
lain
265746b21f
Merge branch 'openapi/pleroma-api/emojis' into 'develop'
...
Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549
4 years ago
lain
c7cdc553ff
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
4 years ago
lain
423ea497bb
Merge branch 'feature/1734-user-deletion' into 'develop'
...
User deletion
Closes #1734
See merge request pleroma/pleroma!2493
4 years ago
lain
eb5f428565
CommonAPI: Change public->private implicit addressing.
...
This will not add the OP to the `to` field anymore when going from
public to private.
4 years ago
Egor Kislitsyn
5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
4 years ago
Egor Kislitsyn
f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
4 years ago
Egor Kislitsyn
9a5de0f454
Move reaction actions to EmojiReactionController
4 years ago
Egor Kislitsyn
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
4 years ago
Haelwenn
94ba5a7802
Merge branch 'exposed-background-image' into 'develop'
...
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
4 years ago
lain
6dd1575c64
Merge branch 'issue/1509' into 'develop'
...
[#1509 ] purge media from cache after delete
See merge request pleroma/pleroma!2539
4 years ago
Egor Kislitsyn
6609714d66
Move Scrobble views to ScrobbleView
4 years ago
Egor Kislitsyn
524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
4 years ago
Haelwenn
58ccd2bbfd
Merge branch 'openapi/pleroma-api/mascot' into 'develop'
...
Add OpenAPI spec for MascotController
See merge request pleroma/pleroma!2553
4 years ago
Maksim Pechnikov
41f8f17260
fix api/v1/accounts/update_credentials
4 years ago
Maksim Pechnikov
5f0a3ac74d
added tests
4 years ago
lain
d19c716770
AttachmentValidator: Handle empty mediatypes
4 years ago
Egor Kislitsyn
fe5d423b43
Add OpenAPI spec for MascotController
4 years ago
Egor Kislitsyn
45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
4 years ago
lain
be4db41d71
ChatMessageValidator: Allow one message in an array, too.
4 years ago
lain
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
aef31c69df
Rename EmojiAPIController to EmojiPackController
4 years ago
Egor Kislitsyn
8bde8dfec2
Cleanup Pleroma.Emoji.Pack
4 years ago
Egor Kislitsyn
6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
4 years ago
lain
0d5bce018d
AnnounceValidator: Validate for existing announce
4 years ago
lain
17a8342c1e
ObjectValidators: Add basic Announce validator.
4 years ago
lain
63ab2743ce
TransmogrifierTest: Fix tests.
4 years ago
lain
7d381b16b7
Transmogrifier Test: Extract Announce handling.
4 years ago
Alexander Strizhakov
215daabdb4
copyright update
4 years ago
lain
188b32145e
InstanceView: Expose background image link.
...
This will make it easier for more clients to support this feature.
4 years ago
lain
96f7b1b140
Merge branch 'show-media-endpoint-fixes' into 'develop'
...
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
4 years ago
Roman Chvanikov
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Alexander Strizhakov
0321a3e078
test naming fix
4 years ago
Alexander Strizhakov
b1aa402229
removing 410 status
4 years ago
Alexander Strizhakov
e7bc2f980c
account visibility
4 years ago
Ivan Tashkinov
9b76565264
MediaController: enforced owner-only access in :show action.
...
Improved error response on denied access (now 403). Adjusted tests.
4 years ago
lain
baf051a59e
SideEffects: Don't update unread count for actor in chatmessages.
4 years ago
lain
9c17109765
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
8bfd9710ae
Pleroma Authenticator: Also update passwords here.
4 years ago
lain
4b28d812cf
Merge branch 'restricted-relations-embedding' into 'develop'
...
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
4 years ago
Ivan Tashkinov
af9dfdce6b
MediaController OAuth scope assignments fix.
...
Typo fix (`def get_media` instead of `def show`).
4 years ago
lain
d96f8f17e8
Merge branch 'features/mastoapi_v2_media' into 'develop'
...
MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439
4 years ago
lain
d15aa9d950
Merge branch 'develop' into 'remove-twitter-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
4 years ago
Ivan Tashkinov
978ccf8f97
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain
2dcb26a6e5
CommonAPI: Unblock a user even if we don't have an activity.
4 years ago
Alexander Strizhakov
3c29f4f957
returning partial chain
4 years ago
lain
f012c3a202
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
e4b12494d7
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
rinpatch
e455ca3f3e
Merge branch 'feature/database-configuration-whitelist' into 'develop'
...
Database configuration whitelist
See merge request pleroma/pleroma!2522
4 years ago
Egor Kislitsyn
bb03dfdb03
Do not require `description` in `update` action
4 years ago
Egor Kislitsyn
0f885b4b86
Fix OpenAPI spec
4 years ago
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups
4 years ago
lain
3342846ac2
ChatView: Add update_at field.
4 years ago
Haelwenn (lanodan) Monnier
cb363f0183
MastodonAPI: /api/v2/media endpoints
4 years ago
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
4 years ago
Roman Chvanikov
8a383707ae
Merge develop
4 years ago
Egor Kislitsyn
6802dc28ba
Add OpenAPI spec for PleromaAPI.AccountController
4 years ago
lain
da550be066
Merge branch 'fix/1742-random-failing-tests' into 'develop'
...
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
4 years ago
lain
0f0acc740d
Chat: Allow posting without content if an attachment is present.
4 years ago
lain
06cad239e5
InstanceView: Add pleroma chat messages to nodeinfo
4 years ago
lain
3cff4e24cd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
bcadbf964a
Add OpenAPI spec for SuggestionController
4 years ago
Ivan Tashkinov
fd2fb2bb2e
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
4 years ago
lain
156c8a5088
Merge branch 'openapi/statuses' into 'develop'
...
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
4 years ago
lain
1307d6ca3c
Merge branch 'openapi/timelines' into 'develop'
...
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
4 years ago
Alexander Strizhakov
2c356a4bac
don't use async with global mocks
4 years ago
Alexander Strizhakov
12635bc156
don't use global mocks in setup callbacks
4 years ago
Alexander Strizhakov
ec27f346ee
correct order for publised in assert
4 years ago
Alexander Strizhakov
e0944dee99
make test fail everytime
4 years ago
Alexander Strizhakov
712055612f
don't run tests which change env in async
4 years ago
Alex Gleason
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
4 years ago
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController
4 years ago
Stephanie Wilde-Hobbs
a2fcfc78c9
Filter config descriptions by config whitelist
4 years ago
rinpatch
2b18b8a263
Merge branch 'streamer-get-topic' into 'develop'
...
Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519
4 years ago
rinpatch
24c8c13640
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
...
ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514
4 years ago
rinpatch
4cc71aad65
Merge branch '1748-remote-following-follower-count' into 'develop'
...
Transmogrifier: On incoming follow accept, update follow counts.
Closes #1748
See merge request pleroma/pleroma!2515
4 years ago
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist
4 years ago
href
e6d8cacf2d
Expand and authorize streams in Streamer directly
4 years ago
lain
c0ea5c60e4
ChatController: Don't return chats for user you've blocked.
4 years ago
lain
e44166b510
Credo fixes.
4 years ago
lain
ec72cba43e
Chat Controller: Add basic error handling.
4 years ago
lain
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
b5aa204eb8
ChatController: Support deletion of chat messages.
4 years ago
lain
dfb90a1fd6
Transmogrifier: Add tests for certain announces
4 years ago
lain
ca31af473c
Transmogrifier: On incoming follow accept, update follow counts.
4 years ago
lain
d0ba1844b0
ActivityPub: Fix non-federating blocks.
4 years ago
rinpatch
f8190aea5e
Merge branch 'fix/issue-1676' into 'develop'
...
[#1676 ] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
4 years ago
Ivan Tashkinov
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
4 years ago
lain
f28ed36b4d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
679afb2de4
SideEffects test: Add test for favorite deletion.
4 years ago
lain
5367a00257
Deletion: Handle the case of pruned objects.
4 years ago
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController
4 years ago
lain
1b1dfb54eb
Credo fixes.
4 years ago
lain
8d5597ff68
ChatController: Add GET /chats/:id
4 years ago
lain
f335e1404a
ChatView: Add the last message to the view.
4 years ago
Ivan Tashkinov
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
4 years ago
Ivan Tashkinov
14a49a0483
[ #2456 ] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
4 years ago
Roman Chvanikov
942093683a
Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Roman Chvanikov
cbe383ae83
Update stats admin endpoint
4 years ago
Ivan Tashkinov
bbdad85568
Initial implementation of image preview proxy. Media proxy tests refactoring.
4 years ago
Ivan Tashkinov
b2924ab1fb
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
4 years ago
lain
03529f6a05
Transmogrifier: Don't modify attachments for chats.
4 years ago
Alexander Strizhakov
287f781808
user deletion
4 years ago
lain
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
fbcc53760e
Merge branch 'feature/emojireactvalidator' into 'develop'
...
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
4 years ago
lain
7e9aaa0d02
Transmogrifier tests: Remove more double tests.
4 years ago
lain
f1274c3326
Transmogrifier tests: Remove double tests.
4 years ago
Maksim Pechnikov
4d71c4b805
fixed 'source' object in verify_credentials
4 years ago
lain
0cf43391f2
Merge branch 'issue/1276-2' into 'develop'
...
[#1276 ] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
4 years ago
lain
218a22c9a3
Merge branch 'fix/privacy-notification' into 'develop'
...
Privacy option affects all push notifications, not just Direct Messages
Closes #1745
See merge request pleroma/pleroma!2485
4 years ago
Maksim Pechnikov
b078e0567d
Merge branch 'develop' into issue/1276-2
4 years ago
Haelwenn
769d95644d
Merge branch 'feature/restrict-c2s' into 'develop'
...
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
4 years ago
lain
ef55d24054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
4 years ago
rinpatch
bef08b85e5
Merge branch 'feature/undo-validator-reduced' into 'develop'
...
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
4 years ago
Mark Felder
ea01e647df
Test Direct, Public, and Favorite notifications with privacy option
4 years ago
lain
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
7ac0cffb34
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
4 years ago
lain
788b7e7bbd
Merge fixes.
4 years ago
lain
f0c22df226
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
4 years ago
Egor Kislitsyn
dc4a448f48
Add OpenAPI spec for SearchController
4 years ago
lain
4c92dfb73e
Merge branch 'openapi/polls' into 'develop'
...
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
4 years ago
lain
4061841846
Merge branch 'streamer-worker-registry' into 'develop'
...
Streamer rework
See merge request pleroma/pleroma!2426
4 years ago
href
9491ba3e49
Streamer rework
4 years ago
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
Mark Felder
a2580adc91
Hide the sender when privacy option is enabled
4 years ago
lain
1748e26948
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
473b0d9f3d
Merge branch 'feature/delete-validator' into 'develop'
...
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
4 years ago
lain
fc9d0b6eec
Credo fixes.
4 years ago
lain
20baa2eaf0
ChatMessages: Add attachments.
4 years ago
Maksim Pechnikov
bd261309cc
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
4 years ago
Maksim Pechnikov
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
4 years ago
lain
205313e541
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
07e7c80bc9
Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'
...
Refactoring of :if_func / :unless_func plug options
See merge request pleroma/pleroma!2446
4 years ago
lain
a716543267
Merge branch 'openapi/subscriptions' into 'develop'
...
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
4 years ago
lain
61ea8f1f5a
Merge branch 'openapi/markers' into 'develop'
...
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
4 years ago
lain
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
4 years ago
lain
c3f1ce80eb
Merge branch 'fix/1726-user-pagination' into 'develop'
...
Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452
4 years ago
lain
0a88bf6a9d
Merge branch 'openapi/follow_requests' into 'develop'
...
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
4 years ago
lain
957172a307
Merge branch 'openapi/filters' into 'develop'
...
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
4 years ago
lain
1ee34d4acb
Merge branch 'openapi/instance' into 'develop'
...
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
4 years ago
lain
7fdc7078ae
Merge branch 'openapi/lists' into 'develop'
...
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
4 years ago
lain
76c1a7a34b
Merge branch 'openapi/conversations' into 'develop'
...
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
4 years ago
Maksim Pechnikov
fb38b7339c
Merge branch 'develop' into issue/1276-2
4 years ago
Egor Kislitsyn
332e016bcd
Add OpenAPI spec for ScheduledActivityController
4 years ago
Egor Kislitsyn
0a1394cc1a
Add OpenAPI spec for PollController
4 years ago
lain
92caae5923
Undoing: Move undoing blocks to the pipeline everywhere.
4 years ago
lain
a3bb2e5474
Undoing: Move undoing announcements to the pipeline everywhere.
4 years ago
lain
b34debe615
Undoing: Move undoing reactions to the pipeline everywhere.
4 years ago
Egor Kislitsyn
3a45952a3a
Add OpenAPI spec for ConversationController
4 years ago
Egor Kislitsyn
46aae346f8
Move single used schemas to Filter operation schema
4 years ago
Egor Kislitsyn
7e7a3e1544
Add OpenAPI spec for FilterController
4 years ago
lain
42a2acac46
Merge branch 'feature/1720-status-view' into 'develop'
...
Admin API fetch status by id
Closes #1720
See merge request pleroma/pleroma!2475
4 years ago
Egor Kislitsyn
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
4 years ago
Egor Kislitsyn
88a14da817
Add OpenAPI spec for InstanceController
4 years ago
Alexander Strizhakov
e7d8ab8303
admin_api fetch status by id
4 years ago
lain
a3071f0231
Undoing: Move undoing likes to the pipeline everywhere.
4 years ago
Egor Kislitsyn
5ec6aad567
Add OpenAPI spec for ListController
4 years ago
Egor Kislitsyn
babcae7130
Move single used schemas to Marker operation schema
4 years ago
Egor Kislitsyn
8096565653
Add OpenAPI spec for MarkerController
4 years ago
Egor Kislitsyn
d861b0790a
Add OpenAPI spec for SubscriptionController
4 years ago
lain
f1da8882f9
UndoValidator: Add UndoValidator.
4 years ago
rinpatch
33f2976020
Merge branch 'feature/1737-magic-key-field' into 'develop'
...
User, Webfinger: Remove OStatus vestiges
Closes #1737
See merge request pleroma/pleroma!2471
4 years ago
lain
8b2457bdbf
Transmogrifier tests: Extract Undo handling
4 years ago
Egor Kislitsyn
decaa64f75
Merge branch 'develop' into global-status-expiration
4 years ago
lain
db55dc9445
ActivityPub: Remove `react_with_emoji`.
4 years ago
lain
ad771546d8
Transmogrifier: Move emoji reactions to common pipeline.
4 years ago
lain
142bf0957c
Transmogrifier: Extract EmojiReact tests.
4 years ago
lain
c297667f16
Merge branch 'fix/issue-1729' into 'develop'
...
Only update follower/following stats for actor types of users and bots.
Closes #1565 and #1729
See merge request pleroma/pleroma!2464
4 years ago
lain
2cb3f8a8cf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
6400998820
AP C2S: Restrict creation to `Note`s for now.
4 years ago
lain
6a2905ccf0
WebFinger Test: Add back test.
4 years ago
lain
8bed6ea922
User, Webfinger: Remove OStatus vestiges
...
Mainly the `magic_key` field
4 years ago
Haelwenn (lanodan) Monnier
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
4 years ago
lain
c23cb8d37a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
0f9bed022f
LikeValidator: Fix up context.
4 years ago
lain
e03c301ebe
LikeValidator: Fix up missing recipients.
4 years ago
lain
335aabc39c
Transmogrifier tests: Extract like tests.
4 years ago
lain
ec24c70db8
ActivityPub: Don't fetch `Application` follower counts.
4 years ago
lain
b04328c3de
ChatController: Add mark_as_read
4 years ago
lain
c40afe5ba0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
fe7a0d660e
Merge branch 'develop' into issue/1276-2
4 years ago
lain
6c337489f4
Various testing fixes in relation to user deletion.
4 years ago
lain
6fb96f64c1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
4dfc617cdf
Transmogrifier: Don't fetch actor that's guaranteed to be there.
4 years ago
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
4 years ago
eugenijm
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
4 years ago
rinpatch
e55876409b
Deactivate local users on deletion instead of deleting the record
...
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
4 years ago
Ivan Tashkinov
2d07ed7747
[ #1732 ] Made AP C2S :followers and :following endpoints serve on no auth
...
(as for related :api pipeline endpoints).
4 years ago
rinpatch
e7b1df7252
Fix sporadic test compilation failure caused by unused alias
4 years ago
Ivan Tashkinov
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
4 years ago
Alexander Strizhakov
aea781cbd8
credo fix
4 years ago
lain
3370bb0e46
Merge branch 'openapi/notifications' into 'develop'
...
Add OpenAPI spec for NotificationController
See merge request pleroma/pleroma!2437
4 years ago
lain
607e06c245
Merge branch 'openapi/reports' into 'develop'
...
Add OpenAPI spec for ReportController
See merge request pleroma/pleroma!2434
4 years ago
lain
44fbd09709
Merge branch 'issue/1577' into 'develop'
...
[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372
4 years ago
lain
1ead5f49b8
AdminApiController: Use common pipeline for user deletion.
4 years ago
lain
ebbd9c7f36
AdminAPIController: Refactor.
4 years ago
lain
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
4 years ago
lain
ab01863abf
Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
4 years ago
lain
5f42e6629d
DeleteValidator: Only allow deletion of certain types.
4 years ago
Alexander Strizhakov
ecf37b46d2
pagination fix for service users filters
4 years ago
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
lain
da4b79a56d
Merge branch 'tests/more-apc2s' into 'develop'
...
Increase tests on AP C2S
See merge request pleroma/pleroma!2449
4 years ago
Lain Soykaf
93f64aba78
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
4 years ago
lain
32b8386ede
DeleteValidator: Don't federate local deletions of remote objects.
...
Closes #1497
4 years ago
lain
999d639873
ActivityPub: Remove `delete` function.
...
This is handled by the common pipeline now.
4 years ago
lain
500f5ec14e
SideEffects: On deletion, reduce the reply count cache
4 years ago
Haelwenn (lanodan) Monnier
f1523f9acd
Increase tests on AP C2S
...
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
4 years ago
lain
ab60ee1776
SideEffects: On deletion, reduce the User note count.
4 years ago
lain
3d0dc58e2e
SideEffectsTest: Test streaming.
4 years ago
lain
315b773dd9
ObjectValidator: Refactor.
4 years ago
lain
4500fdc04c
DeleteValidator: Add internal helper field after validation.
4 years ago
lain
143353432a
StreamerTest: Separate deletion test.
4 years ago
Ivan Tashkinov
2c4844237f
Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug.
4 years ago
lain
c9bfa51ea9
Credo fixes.
4 years ago
lain
417eed4a2b
SideEffects: Handle deletions.
4 years ago
lain
1fb383f368
DeleteValidator: Deleting a user is valid.
4 years ago
lain
4dc5302f45
Transmogrifier: Handle incoming deletes for non-user objects.
4 years ago
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update
4 years ago
Alexander Strizhakov
342f55fb92
refactor emoji api with fixes
4 years ago