Commit Graph

377 Commits (dd947d9bc8320ec828df97353733bed4d4e2b5b8)

Author SHA1 Message Date
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
Alexander Strizhakov b5b4395e4a
oauth consistency
4 years ago
Alex Gleason 3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
4 years ago
Alex Gleason 77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Egor Kislitsyn 86ce4afd93
Improve backup urls
4 years ago
Egor Kislitsyn 2c73bfe122
Add API endpoints for Backups
4 years ago
Mark Felder 346cc3ac24 Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
4 years ago
rinpatch 9e96c9ae48 Merge branch 'fix/empty-params-openapi' into 'develop'
4 years ago
rinpatch 006b62fd12 OpenAPI CastAndValidate: filter out empty params
4 years ago
Maksim Pechnikov de993b856b added `force` option to the unfollow operation
4 years ago
Alexander Strizhakov 5d7ec00bed
fixes after rebase
4 years ago
Alexander Strizhakov dbbc801667
pagination for remote emoji packs
4 years ago
Alexander Strizhakov 9b6d89ff8c
support for special chars in pack name
4 years ago
lain 436d1a3c41 Merge branch 'develop' into 'issue/2115'
4 years ago
Roman Chvanikov 8f5589cf66 Merge develop
4 years ago
Maksim Pechnikov 72d2b34d3b Merge branch 'develop' into issue/1975
4 years ago
lain c95859e45b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
4 years ago
lain b36b6259d8 Merge branch 'issue/2099' into 'develop'
4 years ago
Roman Chvanikov 4987ee6256 Merge branch 'develop' into feature/expire-mutes
4 years ago
rinpatch 51116b5392 OpenAPI: fix various errors pointed out by editor.swagger.io
4 years ago
Maksim Pechnikov 2ec0dcf001 Merge branch 'develop' into issue/2099
4 years ago
Haelwenn (lanodan) Monnier 7bf269fe83 Fix MRF reject for ChatMessage
4 years ago
eugenijm c711a2b157 Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
4 years ago
eugenijm 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
Alex Gleason 9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
4 years ago
Alex Gleason 02d70228b5
AdminAPI: fix delete chat message
4 years ago
Alex Gleason 9dd0b23da4
AdminAPI: show chat
4 years ago
Alex Gleason f13b52a703
AdminAPI: list messages in a chat
4 years ago
Alex Gleason b40a627ab0
AdminAPI: delete a chat message
4 years ago
Maksim Pechnikov 9853c90abb added paginate links to headers for /chats/:id/messages
4 years ago
Roman Chvanikov e3f845b243 Add expiring mutes for activities
4 years ago
Roman Chvanikov c56e3d4f3b Add expires_in param for account mutes
4 years ago
Maksim Pechnikov 917d325972 added api spec
4 years ago
Haelwenn (lanodan) Monnier d872858046
Fix removing an account from a list
4 years ago
Maksim Pechnikov 0922791e4d updated errors on add emoji
4 years ago
Maksim Pechnikov f5845ff033 upload emoji zip file
4 years ago
Alexander Strizhakov 7dc275b69b
relay fix for admin-fe
4 years ago
Maksim Pechnikov 7794d7c694 added Pleroma.Web.PleromaAPI.EmojiFileController
4 years ago
Maksim Pechnikov 345ac512e4 added paginate+search for admin/MediaProxy URLs
4 years ago
Alex Gleason 4af1b80381
Clean up account aliases
4 years ago
Alex Gleason 1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Alex Gleason 24ce9c011c Apply 1 suggestion(s) to 1 file(s)
4 years ago
Alex Gleason cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Ivan Tashkinov 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed.
4 years ago
lain a3c37379e9 ChatMessage schema: Add preview cards.
4 years ago
Alibek Omarov 6107440ea0 OpenAPI: remove accidentally pasted buffer data
4 years ago
Alibek Omarov b31844d6e0 OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
4 years ago
Mark Felder 4bfad0b483 Support blocking via query parameters as well and document the change.
4 years ago
Egor Kislitsyn bdb3375933
Allow unblocking a domain via query params
4 years ago
Alex Gleason afa8b469ed
Allow restricting public timeline by instance
4 years ago
Alex Gleason d0eb43b58b
Add account aliases
4 years ago
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings
4 years ago
Ivan Tashkinov 124b4709dc [#1940] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.
4 years ago
Mark Felder 80c21100db Merge branch 'develop' into refactor/notification_settings
4 years ago
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop'
4 years ago