3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
4 years ago
72143dd732
Merge branch 'richmedia-workaround' into 'develop'
...
Workaround for RichMedia preview image breakage edge case
See merge request pleroma/pleroma!3363
4 years ago
b80f868c6b
Prefer naming this function build_image_url/2
4 years ago
029ff65389
Leverage function pattern matching instead
4 years ago
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
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
8d601d3b23
Make the object reference in both render("show.json", _) functions consistently named
4 years ago
85b2387f66
Fix build_application/1 match
4 years ago
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
b1e1db82bc
Store application details in the object under the generator key, not application key
4 years ago
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
4 years ago
d35b6254b4
Store the client application data in ActivityStreams format
4 years ago
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
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
1e6c27181e
expires_in in scheduled status params
4 years ago
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
4 years ago
4540e08a6a
Rendering fallback for when we don't have valid data available
4 years ago
981349f21d
Enable rendering of the client application data details
4 years ago
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
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
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
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
793fc77b16
Add active user count
4 years ago
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
2cb5c16723
Credo
4 years ago
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
4 years ago
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
6bfd497f4a
Include own_votes in the poll data
4 years ago
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
80ccdb56f6
Make tag urls absolute
4 years ago
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
4 years ago
18b536c176
Pleroma.Object/1: take %Object{} as argument instead
4 years ago
87b13c5430
Create Object.hashtags/1 wrapper
4 years ago
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
4 years ago
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
4 years ago
6dac2ac71a
Minor refactoring of the logic for hiding followers/following counts.
...
Field is not nullable anymore, and this is more readable.
4 years ago
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
4 years ago
Alexander Strizhakov