Commit Graph

333 Commits (6806c03e8543c57ef85393eafdc6117d9776049f)

Author SHA1 Message Date
Mark Felder 537ba1c5e0 Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
feld 958a7f6ed0 Merge branch 'fix/reblog-api' into 'develop'
4 years ago
Mark Felder 28581e03ad Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
Egor Kislitsyn 1b79dce7bc
Fix Reblog API
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
4 years ago
Alex Gleason cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
lain 6bb4f4e172 Merge branch 'support/2255_posix_errors' into 'develop'
4 years ago
Ivan Tashkinov 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
minibikini 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions'
4 years ago
lain aae669d05e Merge branch 'fix/webpush-and-emojireact' into 'develop'
4 years ago
Mark Felder 5d0bc5e028 Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
4 years ago
Mark Felder 67a6abd071 Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
lain bb9650f3c2 FrontendController: Return error on installation error.
4 years ago
Egor Kislitsyn f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn 79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
Maksim Pechnikov e4b202d905 added test
4 years ago
Egor Kislitsyn fb41bd1a85 Hide reactions from muted and blocked users
4 years ago
Maksim Pechnikov 36ec604521 added test
4 years ago
Ilja 70e4b86250 Make notifs view work for reports
4 years ago
Egor Kislitsyn 08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn 0118ccb53c
Add `local` visibility
4 years ago
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain 4800ee656b Merge branch 'features/federation-status' into 'develop'
4 years ago
lain 5db4c823b2 Merge branch 'restrict-domain' into 'develop'
4 years ago
Haelwenn 9c09ea01aa Merge branch '2284-voters-count' into 'develop'
4 years ago
lain 504a829edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
4 years ago
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
Egor Kislitsyn ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain 92d252f364 Poll Schema: Update and fix.
4 years ago
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api'
4 years ago
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Egor Kislitsyn d83c2bd330
Add support for install via `file` and `build_url` params
4 years ago
Egor Kislitsyn 03e306785b
Add an API endpoint to install a new frontend
4 years ago
Egor Kislitsyn 76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
Haelwenn (lanodan) Monnier aafdc975bd
federation_status: Add ApiSpec
4 years ago
Egor Kislitsyn 4f79bbbc31
Add local-only statuses
4 years ago
Mark Felder 1fb9452131 Merge branch 'develop' into feature/account-export
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
Alex Gleason 755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Alex Gleason 7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Egor Kislitsyn 6734abcbd4
Add pagination for Mutes
4 years ago
Egor Kislitsyn 33f4f39b1c
Add pagination for Blocks
4 years ago
Mark Felder 409f694e4f Merge branch 'develop' into refactor/locked_user_field
4 years ago
Mark Felder 9968b7efed Change user.locked field to user.is_locked
4 years ago