lain
|
d4d4b92f75
|
TimelineController: Only return `Create` in public timelines.
|
2020-06-01 13:17:56 +02:00 |
lain
|
b004c427a0
|
Merge branch 'conversation-pagination' into 'develop'
Conversation pagination
See merge request pleroma/pleroma!2601
|
2020-05-30 10:02:37 +00:00 |
Steven Fuchs
|
6d4b80822b
|
Conversation pagination
|
2020-05-30 10:02:37 +00:00 |
rinpatch
|
8f6d428880
|
AccountView: Use mediaproxy URLs for emojis
Also use atom keys in emoji maps instead of binaries
Closes #1810
|
2020-05-27 19:44:02 +03:00 |
lain
|
23e248694d
|
Announcements: Fix all tests.
|
2020-05-21 13:16:21 +02:00 |
Haelwenn
|
94ba5a7802
|
Merge branch 'exposed-background-image' into 'develop'
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
|
2020-05-20 10:53:54 +00:00 |
Egor Kislitsyn
|
6609714d66
|
Move Scrobble views to ScrobbleView
|
2020-05-19 16:26:06 +04:00 |
Maksim Pechnikov
|
41f8f17260
|
fix api/v1/accounts/update_credentials
|
2020-05-19 09:42:41 +03:00 |
Egor Kislitsyn
|
45c3a72404
|
[OpenAPI] Use BooleanLike in all request bodies
|
2020-05-18 20:58:59 +04:00 |
lain
|
188b32145e
|
InstanceView: Expose background image link.
This will make it easier for more clients to support this feature.
|
2020-05-18 13:29:30 +02:00 |
lain
|
96f7b1b140
|
Merge branch 'show-media-endpoint-fixes' into 'develop'
MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541
|
2020-05-18 10:57:59 +00:00 |
Ivan Tashkinov
|
9b76565264
|
MediaController: enforced owner-only access in :show action.
Improved error response on denied access (now 403). Adjusted tests.
|
2020-05-18 09:51:53 +03:00 |
lain
|
4b28d812cf
|
Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
|
2020-05-17 07:26:51 +00:00 |
Ivan Tashkinov
|
af9dfdce6b
|
MediaController OAuth scope assignments fix.
Typo fix (`def get_media` instead of `def show`).
|
2020-05-17 08:46:43 +03:00 |
Egor Kislitsyn
|
bb03dfdb03
|
Do not require `description` in `update` action
|
2020-05-14 16:29:32 +04:00 |
Egor Kislitsyn
|
0f885b4b86
|
Fix OpenAPI spec
|
2020-05-14 16:18:30 +04:00 |
Haelwenn (lanodan) Monnier
|
cb363f0183
|
MastodonAPI: /api/v2/media endpoints
|
2020-05-14 10:14:28 +02:00 |
lain
|
da550be066
|
Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
|
2020-05-13 13:38:32 +00:00 |
Egor Kislitsyn
|
bcadbf964a
|
Add OpenAPI spec for SuggestionController
|
2020-05-13 14:15:24 +04:00 |
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
|
2020-05-13 12:42:36 +03:00 |
lain
|
156c8a5088
|
Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
|
2020-05-13 09:34:30 +00:00 |
lain
|
1307d6ca3c
|
Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
|
2020-05-13 09:33:37 +00:00 |
Alexander Strizhakov
|
12635bc156
|
don't use global mocks in setup callbacks
|
2020-05-13 11:38:22 +03:00 |
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
lain
|
dfb90a1fd6
|
Transmogrifier: Add tests for certain announces
|
2020-05-12 12:50:48 +02:00 |
rinpatch
|
f8190aea5e
|
Merge branch 'fix/issue-1676' into 'develop'
[#1676] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
|
2020-05-11 22:30:36 +00:00 |
Egor Kislitsyn
|
3bde0fa3f6
|
Add OpenAPI spec for TimelineController
|
2020-05-11 15:43:03 +04:00 |
Ivan Tashkinov
|
aee88d11be
|
[#2456] Removed support for embedded relationships in account view.
|
2020-05-10 09:16:48 +03:00 |
Ivan Tashkinov
|
14a49a0483
|
[#2456] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
|
2020-05-09 18:05:44 +03:00 |
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
2020-05-08 21:37:55 +03:00 |
lain
|
fbcc53760e
|
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
|
2020-05-08 10:41:41 +00:00 |
Maksim Pechnikov
|
4d71c4b805
|
fixed 'source' object in verify_credentials
|
2020-05-08 12:35:34 +03:00 |
Maksim Pechnikov
|
b078e0567d
|
Merge branch 'develop' into issue/1276-2
|
2020-05-08 08:51:09 +03:00 |
lain
|
ef55d24054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
2020-05-07 18:53:34 +02:00 |
lain
|
7ac0cffb34
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
2020-05-07 15:03:12 +02:00 |
Egor Kislitsyn
|
dc4a448f48
|
Add OpenAPI spec for SearchController
|
2020-05-07 14:04:48 +04:00 |
lain
|
4c92dfb73e
|
Merge branch 'openapi/polls' into 'develop'
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
|
2020-05-07 09:19:45 +00:00 |
Maksim Pechnikov
|
bd261309cc
|
added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`
|
2020-05-06 15:08:38 +03:00 |
Maksim Pechnikov
|
8b97b6f5ba
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 14:47:50 +03:00 |
lain
|
a716543267
|
Merge branch 'openapi/subscriptions' into 'develop'
Add OpenAPI spec for SubscriptionController
See merge request pleroma/pleroma!2444
|
2020-05-06 09:10:17 +00:00 |
lain
|
61ea8f1f5a
|
Merge branch 'openapi/markers' into 'develop'
Add OpenAPI spec for MarkerController
See merge request pleroma/pleroma!2386
|
2020-05-06 09:06:50 +00:00 |
lain
|
0a88bf6a9d
|
Merge branch 'openapi/follow_requests' into 'develop'
Add OpenAPI spec for FollowRequestController
See merge request pleroma/pleroma!2448
|
2020-05-06 09:00:39 +00:00 |
lain
|
957172a307
|
Merge branch 'openapi/filters' into 'develop'
Add OpenAPI spec for FilterController
See merge request pleroma/pleroma!2382
|
2020-05-06 08:51:10 +00:00 |
lain
|
1ee34d4acb
|
Merge branch 'openapi/instance' into 'develop'
Add OpenAPI spec for InstanceController
See merge request pleroma/pleroma!2450
|
2020-05-06 08:46:14 +00:00 |
lain
|
7fdc7078ae
|
Merge branch 'openapi/lists' into 'develop'
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
|
2020-05-06 08:43:21 +00:00 |
lain
|
76c1a7a34b
|
Merge branch 'openapi/conversations' into 'develop'
Add OpenAPI spec for ConversationController
See merge request pleroma/pleroma!2445
|
2020-05-06 08:40:04 +00:00 |
Maksim Pechnikov
|
fb38b7339c
|
Merge branch 'develop' into issue/1276-2
|
2020-05-06 05:55:39 +03:00 |
Egor Kislitsyn
|
332e016bcd
|
Add OpenAPI spec for ScheduledActivityController
|
2020-05-05 23:42:24 +04:00 |
Egor Kislitsyn
|
0a1394cc1a
|
Add OpenAPI spec for PollController
|
2020-05-05 20:14:22 +04:00 |
Egor Kislitsyn
|
3a45952a3a
|
Add OpenAPI spec for ConversationController
|
2020-05-05 17:44:46 +04:00 |