Egor Kislitsyn
|
b02df1803e
|
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Haelwenn
|
7b02bfca51
|
Merge branch 'announce-validator' into 'develop'
Announce validator
See merge request pleroma/pleroma!2567
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
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 |
