lain
59540131c1
Credo fixes.
4 years ago
lain
e374872fe7
AccountOperation: Correctly describe create response.
4 years ago
lain
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
4 years ago
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
4 years ago
lain
f378e93bf4
AccountController: Return scope in proper format.
4 years ago
lain
8cfb58a8c0
AccountController: Extract blocking to CommonAPI.
4 years ago
lain
35f6770436
StatusView: Add pleroma.parent_visible
4 years ago
lain
98af7b59e4
Merge branch 'update-validator' into 'develop'
...
Update validator
See merge request pleroma/pleroma!2668
4 years ago
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
4 years ago
lain
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Mark Felder
df5e048cbb
Do not need a function to provide fallback value with default defined in config.exs
4 years ago
lain
46f7e51b27
Merge branch 'add-muted-to-notifications' into 'develop'
...
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
4 years ago
Egor Kislitsyn
7e6f43c0d7
Add `is_muted` to notifications
4 years ago
lain
59bdef0c33
Merge branch 'feature/1739-account-endpoints' into 'develop'
...
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
4 years ago
lain
b05f795326
Credo fixes
4 years ago
lain
e785cd5cae
ActivityPub: Remove `update` and switch to pipeline.
4 years ago
Sergey Suprunenko
ac0344dd24
Only accounts with Service actor_type are considered as bots
4 years ago
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials
4 years ago
Ivan Tashkinov
5237a2df9f
[ #1873 ] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
4 years ago
href
39f7fc5b8e
Update majic & call plug before OpenApiSpex
4 years ago
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
4 years ago
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
4 years ago
lain
b7df7436c8
Conversations: Return last dm for conversation, not last message.
4 years ago
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
Egor Kislitsyn
520367d6fd
Fix atom leak in Rich Media Parser
4 years ago
Haelwenn
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
4 years ago
Ivan Tashkinov
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
Ivan Tashkinov
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
4 years ago
lain
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
4 years ago
lain
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn (lanodan) Monnier
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
4 years ago
lain
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
4 years ago
Egor Kislitsyn
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
4 years ago
lain
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn
d74985af23
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
4 years ago
Haelwenn
54bae06b4f
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
...
Unifies all the similar functions to one and simplify some blocks with it.
4 years ago
Egor Kislitsyn
317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
4 years ago
lain
f3ccd50a33
ChatMessageReferences: Adjust views
4 years ago
feld
6c1c2cddec
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
...
[#1794 ] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
4 years ago
lain
37542a9dfa
Activity: Remove notifications-related functions.
4 years ago
lain
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
4 years ago
lain
805ab86933
Notifications: Make notifications save their type.
4 years ago
lain
8e1db6a835
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
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
Alex Gleason
954acdda20
Add `account_activation_required` to /api/v1/instance
4 years ago
lain
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
4 years ago
Haelwenn (lanodan) Monnier
b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain
af6d01ec93
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
lain
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
4 years ago
lain
ee35bb5ac2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn
7b02bfca51
Merge branch 'announce-validator' into 'develop'
...
Announce validator
See merge request pleroma/pleroma!2567
4 years ago
lain
814c3e5171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
23e248694d
Announcements: Fix all tests.
4 years ago
eugenijm
b7fc61e17b
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
4 years ago
Ivan Tashkinov
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
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
Egor Kislitsyn
6609714d66
Move Scrobble views to ScrobbleView
4 years ago
Maksim Pechnikov
41f8f17260
fix api/v1/accounts/update_credentials
4 years ago
lain
0d417e005d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
Alexander Strizhakov
1671864d88
return :visible instead of boolean
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
9c17109765
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
Ivan Tashkinov
e4b12494d7
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
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
Haelwenn (lanodan) Monnier
099e314a1b
Add OpenAPISpex for MediaController
4 years ago
Haelwenn (lanodan) Monnier
cb363f0183
MastodonAPI: /api/v2/media endpoints
4 years ago
Ivan Tashkinov
8062d590dd
[ #2456 ] OpenAPI-related tweaks. Removed support for `with_relationships` param in `GET /api/v1/accounts/search`.
4 years ago
Ivan Tashkinov
59b6d5f2aa
[ #2456 ] Changed `embed_relationships` param to `with_relationships`.
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
33b798425f
[ #2456 ] Post-merge fix.
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
Egor Kislitsyn
7803a85d2c
Add OpenAPI spec for StatusController
4 years ago
Ivan Tashkinov
63a1a82f38
[ #2456 ] Added support for `embed_relationships` param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
4 years ago
href
e6d8cacf2d
Expand and authorize streams in Streamer directly
4 years ago
lain
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
href
e2b15e8ad3
Fix streamer timeout ( closes #1753 ).
...
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
4 years ago
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController
4 years ago
Ivan Tashkinov
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
4 years ago
Ivan Tashkinov
ac4250a18c
[ #2456 ] Clarified `skip_relationships` option (and its default of `false`) for MastodonAPI.AccountView.
4 years ago
Ivan Tashkinov
14a49a0483
[ #2456 ] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
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
7637ef4203
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim Pechnikov
4d71c4b805
fixed 'source' object in verify_credentials
4 years ago
Maksim Pechnikov
b078e0567d
Merge branch 'develop' into issue/1276-2
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
lain
516ff945ce
Merge branch 'openapi/search' into 'develop'
...
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
4 years ago
rinpatch
eb1f2fcbc6
Streamer: Fix wrong argument order when rendering activities to authenticated user
...
Closes #1747
4 years ago
lain
fb2d284d28
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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
href
9491ba3e49
Streamer rework
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
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
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
Egor Kislitsyn
3a45952a3a
Add OpenAPI spec for ConversationController
4 years ago
Egor Kislitsyn
32ca9f2c59
Render mastodon-like errors in FilterController
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
Egor Kislitsyn
ec1e4b4f1a
Add OpenAPI spec for FollowRequestController
4 years ago
Egor Kislitsyn
88a14da817
Add OpenAPI spec for InstanceController
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
Egor Kislitsyn
d08c63500b
Ignore unexpected query params
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
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
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
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
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
Egor Kislitsyn
9c1adb35de
Merge branch 'develop' into openapi/notifications
4 years ago
Egor Kislitsyn
1898054da4
Merge branch 'develop' into openapi/reports
4 years ago
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
4 years ago
lain
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController
4 years ago
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController
4 years ago
lain
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
dda65f7799
Move single used schemas to operation schema
4 years ago
Egor Kislitsyn
2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
4 years ago
lain
3635a9c9c2
InstanceController: Add extensions to `/api/v1/instance`
4 years ago
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
lain
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
e16437ff19
[ #1706 ] Formatting fix.
4 years ago
Ivan Tashkinov
0d05e1fe39
[ #1706 ] Prevented error on unresolved activity actors for timeline actions.
4 years ago
Ivan Tashkinov
b4139cc547
[ #2409 ] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.
4 years ago
lain
d89cd0a197
Reply Filtering: Refactor.
4 years ago
Ivan Tashkinov
00e62161f6
[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
4 years ago
Alexander
6e625a427c
reply filtering
4 years ago
lain
ec7335535d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
25eec6d72d
Merge branch 'bugfix/null-scheduled-at' into 'develop'
...
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
4 years ago
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
Ivan Tashkinov
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Ivan Tashkinov
2958a7d246
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
4 years ago
Haelwenn
468cc977be
Merge branch 'bugfix/following-fix-status-code' into 'develop'
...
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
4 years ago
lain
5b39526198
AccountController: Use code 400 for self-follow.
4 years ago
lain
c10485db16
StatusController: Ignore nil scheduled_at parameters.
4 years ago
lain
5102468d0f
Polls: Persist and show voters' count
4 years ago
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
lain
a185b5455f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
4 years ago
lain
5165287ff4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
736fead494
Merge branch 'develop' into openapi/account
4 years ago
lain
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
4 years ago
lain
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
970b74383b
Credo fixes.
4 years ago
lain
c845820911
Notifications: Create a chat notification.
4 years ago
lain
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
5 years ago
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
5 years ago
rinpatch
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
5 years ago
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
5 years ago
lain
ca598e9c27
AccountView: Return user ap_id.
5 years ago
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController
5 years ago
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
5 years ago
Ivan Tashkinov
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
5 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
Egor Kislitsyn
247e6fcb90
Merge branch 'develop' into openapi/account
5 years ago
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
5 years ago
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
5 years ago
Egor Kislitsyn
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
5 years ago
Egor Kislitsyn
ab185d3ea4
Add spec for AccountController.follows
5 years ago
Egor Kislitsyn
68a979b824
Add specs for AccountController.block and AccountController.unblock
5 years ago
Egor Kislitsyn
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
5 years ago
Egor Kislitsyn
aa958a6dda
Add spec for AccountController.unfollow
5 years ago
Egor Kislitsyn
854780c72b
Add spec for AccountController.follow
5 years ago
Egor Kislitsyn
1b680a98ae
Add spec for AccountController.lists
5 years ago
Egor Kislitsyn
e105cc12b6
Add spec for AccountController.following
5 years ago
Egor Kislitsyn
bd6e2b300f
Add spec for AccountController.followers
5 years ago
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses
5 years ago
Egor Kislitsyn
278b3fa0ad
Add spec for AccountController.show
5 years ago
Egor Kislitsyn
d7d6a83233
Add spec for AccountController.relationships
5 years ago
Egor Kislitsyn
260cbddc94
Add spec for AccountController.update_credentials
5 years ago
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create
5 years ago
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Egor Kislitsyn
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
Ivan Tashkinov
ac672a9d6b
[ #1559 ] Addressed code review requests.
5 years ago
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
5 years ago
Ivan Tashkinov
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
5 years ago
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
5 years ago
Ivan Tashkinov
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Ivan Tashkinov
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
5 years ago
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
23219e6fb3
Add OpenAPI
5 years ago
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
5 years ago
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
Ivan Tashkinov
6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
5 years ago
Ivan Tashkinov
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
5 years ago
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
5 years ago
Ivan Tashkinov
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
5 years ago
Ivan Tashkinov
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
Ivan Tashkinov
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
5 years ago
Ivan Tashkinov
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
lain
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
5 years ago
Ivan Tashkinov
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
5 years ago
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Ivan Tashkinov
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
5 years ago
Haelwenn (lanodan) Monnier
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
5 years ago
rinpatch
981e015f1b
Mastodon API Account view: Remove an outdated hack
...
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
5 years ago
lain
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
5 years ago