Commit Graph

209 Commits (f687befb93a9ad2c3dc61f47bdbb717cb1421ad5)

Author SHA1 Message Date
Mark Felder 3ce11b830e Add capability for emoji reaction push notifications
4 years ago
lain bb9650f3c2 FrontendController: Return error on installation error.
4 years ago
feld d33b9e7b33 Merge branch 'remove/fedsockets' into 'develop'
4 years ago
Egor Kislitsyn f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
4 years ago
Egor Kislitsyn 79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
rinpatch 2c55f7d7cb Remove FedSockets
4 years ago
lain 61f86774d1 Merge branch 'chores/note-handling-move' into 'develop'
4 years ago
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain 81293e5aad ActivityPubController: Don't return local only objects
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'
4 years ago
Ilja 70e4b86250 Make notifs view work for reports
4 years ago
rinpatch 6ca709816f Fix object spoofing vulnerability in attachments
4 years ago
Haelwenn 99bc175f02 Merge branch 'title-injection-change' into 'develop'
4 years ago
Mark Felder 966663c3f8 Fix tests for other attachment types
4 years ago
Mark Felder 2254e5e595 Render blurhashes in Mastodon API
4 years ago
Mark Felder 6fd72e9e85 Ingest blurhash for attachments if they were federated
4 years ago
Egor Kislitsyn d26a449396
Change endpoint path
4 years ago
Egor Kislitsyn 435bf1f945
Remove FrontendInstallerWorker
4 years ago
lain 631def2df2 RedirectController: Don't replace title, but inject into the meta
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
feld 3cd7ea693f Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
4 years ago
Alexander Strizhakov 8d218ebaf5
Moving some background jobs into simple tasks
4 years ago
Alexander Strizhakov f97f24b067
making credo happy and test fix
4 years ago
Alexander Strizhakov 485697d96c
config descriptions for custom MRF policies
4 years ago
Alexander Strizhakov 0c68b9ac13
escaping summary and other fields in xml templates
4 years ago
Haelwenn (lanodan) Monnier e010bb292b
NoteHandlingTest: Poison → Jason
4 years ago
Haelwenn (lanodan) Monnier fa1f5d4442
Move TransmogrifierTest for Note to NoteHandlingTest
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
Ivan Tashkinov 73e66fd31f Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
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
lain bc4d9c4ffc Merge branch 'hide-muted-chats' into 'develop'
4 years ago
Egor Kislitsyn ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
lain e46c95b826 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
4 years ago
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain 1cfc3278c0 Poll View: Always return `voters_count`.
4 years ago
lain c37118e6f2 Conversations: A few refactors
4 years ago
lain 91f6c32430 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
4 years ago
Mark Felder 53dd048590 Test the note is returned when fetching a single report
4 years ago
Egor Kislitsyn be52819a11
Hide chats from muted users
4 years ago
lain 24ce324973 Merge branch 'bugfix/poll_replies_count' into 'develop'
4 years ago
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api'
4 years ago
Haelwenn (lanodan) Monnier 4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
4 years ago
feld 38b481d112 Merge branch 'feature/account-export' into 'develop'
4 years ago
Ivan Tashkinov 04f6b48ac1 Auth subsystem refactoring and tweaks.
4 years ago
eugenijm 8e41baff40 Add idempotency_key to the chat_message entity.
4 years ago
Egor Kislitsyn a2a7a1f2ff
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn 1a98476f48 Remove unused aliases
4 years ago
Alibek Omarov 1042c30fa5 ConversationViewTest: fix test
4 years ago
Alibek Omarov 0552a08dfd ConversationControllerTest: fix test, 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 630eb0f939 ConversationViewTest: fix test #2
4 years ago
Alibek Omarov 149589c842 ConversationViewTest: fix test
4 years ago
Alibek Omarov 390a12d4c8 ConversationControllerTest: fix test
4 years ago
minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop'
4 years ago
feld 1cce1bd729 Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
4 years ago
Egor Kislitsyn d83c2bd330
Add support for install via `file` and `build_url` params
4 years ago
Egor Kislitsyn fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn 8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
4 years ago
Ivan Tashkinov ba50dc05a8 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Mark Felder d2b140a525 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
4 years ago
Egor Kislitsyn 4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Haelwenn d8d4bd15d0 Merge branch '2236-no-name' into 'develop'
4 years ago
Mark Felder f2b74f60f0 Merge branch 'develop' into feature/account-export
4 years ago
Maksim Pechnikov d28f72a55a FrontStatic plug: excluded invalid url
4 years ago
Mark Felder cbe41408e4 phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
4 years ago
minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Mark Felder 291189357b Merge branch 'develop' into feature/account-export
4 years ago
Mark Felder 9e54ef086b Merge branch 'develop' into feature/account-export
4 years ago
feld 5aff479951 Merge branch '1668-prometheus-access-restrictions' into 'develop'
4 years ago
Egor Kislitsyn 03e306785b
Add an API endpoint to install a new frontend
4 years ago
lain 9542c5d0f4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
4 years ago
rinpatch df61071422 Merge branch '2242-nsfw-case' into 'develop'
4 years ago
lain 60e379ce0b User: Correctly handle whitespace names.
4 years ago
feld d6907e6e0c Merge branch 'chore/elixir-1.11' into 'develop'
4 years ago
lain 8d251096fe SideEffects: Correctly handle chat messages sent to yourself
4 years ago
Maksim Pechnikov ef627b9391 fix module name
4 years ago
Maksim Pechnikov 60663150b5 admin user search: added filter by `actor_type`
4 years ago
Maksim Pechnikov 46b420aa60 need_confirmed -> unconfirmed
4 years ago
Maksim Pechnikov cf4f393794 added AdminApi.UserController
4 years ago
Maksim Pechnikov 9ef46ce410 added 'unconfirmed' filter to admin/users
4 years ago
Egor Kislitsyn e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
4 years ago
Egor Kislitsyn c1976d5b19 Fix credo warnings
4 years ago
lain 39fd4d7639 Transmogrifier: Downcase incoming Hashtags
4 years ago
Egor Kislitsyn 76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn 18a91d85e5
Merge branch 'develop' into feature/local-only-scope
4 years ago
Haelwenn 0495a07dc7 Merge branch '2239-mute-fixes' into 'develop'
4 years ago
Ivan Tashkinov 524fb0e4c2 [#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
4 years ago
Ivan Tashkinov 9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago