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
cf6d3db58f
Add API endpoint to remove a conversation
4 years ago
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
4 years ago
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
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
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
4 years ago
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
4 years ago
2cb6dc5a3a
list timeline filtration by params
4 years ago
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
4 years ago
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
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
875fbaae35
support for expires_in/expires_at in filters
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
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
80ccdb56f6
Make tag urls absolute
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
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
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!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
c9d73af74d
Cachex: Unify arity of callback function
4 years ago
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
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
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
4 years ago
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
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
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
2254e5e595
Render blurhashes in Mastodon API
4 years ago
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
4 years ago
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
1cfc3278c0
Poll View: Always return `voters_count`.
4 years ago
c37118e6f2
Conversations: A few refactors
4 years ago
d63ec02f31
ConversationView: fix formatting
4 years ago
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
4 years ago
rinpatch