rinpatch
72143dd732
Merge branch 'richmedia-workaround' into 'develop'
...
Workaround for RichMedia preview image breakage edge case
See merge request pleroma/pleroma!3363
4 years ago
Haelwenn
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
4 years ago
Mark Felder
b80f868c6b
Prefer naming this function build_image_url/2
4 years ago
Mark Felder
029ff65389
Leverage function pattern matching instead
4 years ago
Mark Felder
8246db2a96
Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771
...
If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter.
The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL.
4 years ago
Ivan Tashkinov
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov
7f8785fd9b
[ #3213 ] Performance optimization of filtering by hashtags ("any" condition).
4 years ago
Egor Kislitsyn
92ab72dbbb
Update OpenApiSpex dependency
4 years ago
Mark Felder
8d601d3b23
Make the object reference in both render("show.json", _) functions consistently named
4 years ago
Mark Felder
85b2387f66
Fix build_application/1 match
4 years ago
Ivan Tashkinov
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Mark Felder
b1e1db82bc
Store application details in the object under the generator key, not application key
4 years ago
lain
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
4 years ago
Mark Felder
d35b6254b4
Store the client application data in ActivityStreams format
4 years ago
Ivan Tashkinov
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
4 years ago
Mark Felder
63739c5a58
Tests to validate client disclosure obeys user setting
4 years ago
Mark Felder
d5ef02c7a7
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
4 years ago
Alexander Strizhakov
1e6c27181e
expires_in in scheduled status params
4 years ago
rinpatch
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
4 years ago
Egor Kislitsyn
cf6d3db58f
Add API endpoint to remove a conversation
4 years ago
Mark Felder
9b61df1fb6
App is already preloaded into the token, so avoid an extra query
4 years ago
Mark Felder
c1d78328ee
Consistency
4 years ago
Mark Felder
6dc0b13cf8
Revert to original formatting for these function defs
4 years ago
Mark Felder
7c508319a5
Prefer naming this put_application because we're putting it into the params map
4 years ago
Mark Felder
09b8378646
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
4 years ago
Ivan Tashkinov
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
4 years ago
Ivan Tashkinov
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
4 years ago
Mark Felder
4540e08a6a
Rendering fallback for when we don't have valid data available
4 years ago
Mark Felder
981349f21d
Enable rendering of the client application data details
4 years ago
Mark Felder
3dc7e89c54
Ensure we capture the application details into the object
4 years ago
feld
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Ivan Tashkinov
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
feld
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
4 years ago
feld
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
4 years ago
feld
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Alexander Strizhakov
2cb6dc5a3a
list timeline filtration by params
4 years ago
Alexander Strizhakov
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
4 years ago
Ivan Tashkinov
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
Alexander Strizhakov
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
4 years ago
Ivan Tashkinov
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
4 years ago
Ivan Tashkinov
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
4 years ago
Egor Kislitsyn
793fc77b16
Add active user count
4 years ago
Alexander Strizhakov
875fbaae35
support for expires_in/expires_at in filters
4 years ago
Haelwenn
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
4 years ago
Mark Felder
2cb5c16723
Credo
4 years ago
Ivan Tashkinov
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Alexander Strizhakov
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
4 years ago
Mark Felder
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder
6bfd497f4a
Include own_votes in the poll data
4 years ago
Ivan Tashkinov
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
4 years ago