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