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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
