Roman Chvanikov
91b9985e1c
Pass expires_in param from status controller
4 years ago
feld
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
4 years ago
Roman Chvanikov
c56e3d4f3b
Add expires_in param for account mutes
4 years ago
feld
d1a6f67b1d
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
4 years ago
lain
581f382e71
ListController: DRY up stuff.
4 years ago
Mark Felder
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
4 years ago
Haelwenn (lanodan) Monnier
d872858046
Fix removing an account from a list
...
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
4 years ago
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
4 years ago
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
4 years ago
Alex Gleason
4af1b80381
Clean up account aliases
4 years ago
Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Ivan Tashkinov
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
4 years ago
Haelwenn
87fe31fb5c
Merge branch '1993-confirm-users-on-registration' into 'develop'
...
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
4 years ago
lain
c25c21dd22
AccountController: Don't explicitly ask to keep users unconfirmed.
...
Confirmation is set in User.register_changeset based on the config
settings.
4 years ago
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
feld
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
4 years ago
Mark Felder
4bfad0b483
Support blocking via query parameters as well and document the change.
4 years ago
Ivan Tashkinov
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
4 years ago
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
4 years ago
Alex Gleason
afa8b469ed
Allow restricting public timeline by instance
4 years ago
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
lain
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain
8ca1f3e8c6
Merge branch '1723-token-fixes' into 'develop'
...
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
4 years ago
Haelwenn
bdc7b60610
Merge branch '1925-muting-reblogs' into 'develop'
...
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
4 years ago
lain
6d688f14fa
Merge branch 'bugfix/status-deletion' into 'develop'
...
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
4 years ago
lain
6335b32aa8
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
...
[#1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
4 years ago
Ivan Tashkinov
a6495f4a68
[ #1895 ] credo fix.
4 years ago
lain
c0385cf47a
AccountController: Fix muting / unmuting reblogs.
4 years ago
Ivan Tashkinov
3f8370a285
[ #1895 ] Applied code review suggestion.
4 years ago
Ivan Tashkinov
3e08e77151
[ #1895 ] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
lain
59cf78e412
AccountController: Allow removal / reset of user images.
4 years ago
lain
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Roman Chvanikov
fc1f34b851
Delete activity before sending response to client
4 years ago
lain
c2a052a346
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
...
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
4 years ago
lain
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
lain
945e75c8e8
SearchController: Trim query.
4 years ago
lain
e3b5559780
AccountController: Make setting accepts_chat_messages possible.
4 years ago
lain
59540131c1
Credo fixes.
4 years ago
lain
e374872fe7
AccountOperation: Correctly describe create response.
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
2c603f2009
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
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
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
href
f124f68205
Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
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
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
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
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
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
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
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
4 years ago
lain
23e248694d
Announcements: Fix all tests.
4 years ago
Maksim Pechnikov
41f8f17260
fix api/v1/accounts/update_credentials
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
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
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
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
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