Alex Gleason
02b9436494
Don't render media `meta` if nil
3 years ago
Alex Gleason
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
3 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
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
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
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
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
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
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
Mark Felder
80ccdb56f6
Make tag urls absolute
4 years ago
Mark Felder
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Mark Felder
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
Mark Felder
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
Haelwenn (lanodan) Monnier
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
lain
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
lain
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
Alex Gleason
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Haelwenn
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
4 years ago
Haelwenn (lanodan) Monnier
18b536c176
Pleroma.Object/1: take %Object{} as argument instead
4 years ago
Haelwenn (lanodan) Monnier
87b13c5430
Create Object.hashtags/1 wrapper
4 years ago
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
4 years ago
Mark Felder
6dac2ac71a
Minor refactoring of the logic for hiding followers/following counts.
...
Field is not nullable anymore, and this is more readable.
4 years ago
Egor Kislitsyn
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
Mark Felder
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago
Egor Kislitsyn
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
lain
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
Ilja
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
4 years ago
Mark Felder
2254e5e595
Render blurhashes in Mastodon API
4 years ago
lain
1cfc3278c0
Poll View: Always return `voters_count`.
4 years ago
lain
c37118e6f2
Conversations: A few refactors
4 years ago
Alibek Omarov
d63ec02f31
ConversationView: fix formatting
4 years ago
Alibek Omarov
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
4 years ago
Alibek Omarov
241bd061fc
ConversationView: add current user to conversations, according to Mastodon behaviour
4 years ago
Haelwenn
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
4 years ago
Mark Felder
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Alex Gleason
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder
ed61002815
Undo API breaking changes
4 years ago
Mark Felder
b001237b79
Finish undoing API breakage
4 years ago
Mark Felder
8bacdc3680
Change user.discoverable field to user.is_discoverable
4 years ago
Mark Felder
9968b7efed
Change user.locked field to user.is_locked
4 years ago
Alex Gleason
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago