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
|
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
|
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 |
|
lain
|
af6d01ec93
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
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 |
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
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 |
|
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 |
|
Egor Kislitsyn
|
45c3a72404
|
[OpenAPI] Use BooleanLike in all request bodies
|
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
|
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
|
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 |
|
lain
|
f012c3a202
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
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
|
cb363f0183
|
MastodonAPI: /api/v2/media endpoints
|
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
|
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
|
12635bc156
|
don't use global mocks in setup callbacks
|
4 years ago |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
4 years ago |
|
lain
|
dcb5cda324
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
4 years ago |
|
lain
|
dfb90a1fd6
|
Transmogrifier: Add tests for certain announces
|
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 |
|
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
|
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
|
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 |
|
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 |
|
lain
|
ef55d24054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
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 |
|
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 |
|
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 |
|
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 |
|
Egor Kislitsyn
|
ec1e4b4f1a
|
Add OpenAPI spec for FollowRequestController
|
4 years ago |
|
Egor Kislitsyn
|
88a14da817
|
Add OpenAPI spec for InstanceController
|
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
|
db55dc9445
|
ActivityPub: Remove `react_with_emoji`.
|
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 |
|
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 |
|
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
|
00e62161f6
|
[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
|
4 years ago |
|
Egor Kislitsyn
|
f362836742
|
Support validation for inline OpenAPI schema and automatic tests for examples
|
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 |
|
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 |
|
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 |
|
Egor Kislitsyn
|
163341857a
|
Improve OpenAPI errors
|
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
|
4 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
|
4 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
|
4 years ago |
|
rinpatch
|
942d7467ca
|
Merge branch 'develop' into features/remove-user-source_data
|
4 years ago |
|
lain
|
ca598e9c27
|
AccountView: Return user ap_id.
|
4 years ago |
|
Egor Kislitsyn
|
cf4ebba774
|
Cleanup SubscriptionController
|
4 years ago |
|
Maksim Pechnikov
|
4b3b1fec4e
|
added an endpoint for getting unread notification count
|
4 years ago |
|
lain
|
6ace22b56a
|
Chat: Add views, don't return them in timeline queries.
|
4 years ago |
|
Ivan Tashkinov
|
bedf92e064
|
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
|
4 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
|
d7d6a83233
|
Add spec for AccountController.relationships
|
5 years ago |
|
Egor Kislitsyn
|
ab400b2ddb
|
Add specs for ActorType and VisibilityScope
|
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 |
