Commit Graph

4425 Commits (c0aca32dd0aed522cfc537cc88b77f7ff254946b)

Author SHA1 Message Date
Ekaterina Vaartis f6d4acc871 Fix credo warnings
5 years ago
Ekaterina Vaartis 87057101b0 Add documentation for the emoji api endpoints
5 years ago
Ekaterina Vaartis 9eb2ee4df0 Allow importing old (emoji.txt / plain) packs from the filesystem
5 years ago
Ekaterina Vaartis 13cd93a0d3 Use && insted of "and" for checking shared-files for packs
5 years ago
Ekaterina Vaartis f5131540dc Add a way to create emoji packs via an endpoint
5 years ago
Ekaterina Vaartis 8dbdd5c280 Allow uploading new emojis to packs from URLs
5 years ago
Ekaterina Vaartis 16edfef12e Handle empty shortcode/filename/new_shortcode/new_filename
5 years ago
Ekaterina Vaartis 9afe7258dd Implememt emoji pack file updating + write tests
5 years ago
Ekaterina Vaartis 261d92f9c2 Update the pack fallback-src sha generation condition
5 years ago
Ekaterina Vaartis bcc0bfd0c5 Add an endpoint for emoji pack metadata updating
5 years ago
Ekaterina Vaartis b78973d27f fallback can't have pack.json, reflect that in code
5 years ago
Ekaterina Vaartis 2a94eca096 Change YAML to JSON
5 years ago
Ekaterina Vaartis b0ecd412f5 Clean out old emojis on reload
5 years ago
Ekaterina Vaartis 2d4b8f3d20 Add an endpoint for deleting emoji packs
5 years ago
Ekaterina Vaartis 3a8669b487 Fix responses for emoji pack controlller
5 years ago
Ekaterina Vaartis 7a0c755d0a Send ok for emoji reloading as text, not as json
5 years ago
Ekaterina Vaartis ee620ecbf1 Add caching for emoji pack sharing
5 years ago
Ekaterina Vaartis 7fb7dd9e0e Only find SHA256 for packs that are shared
5 years ago
Ekaterina Vaartis 54b8e683bc Swap TOML for YAML to get YAML generation for packs from fallbacks
5 years ago
Ekaterina Vaartis b791a08656 Implement API actions on packs
5 years ago
Ekaterina Vaartis 6a42641b8d Add pack.toml loading
5 years ago
feld ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop'
5 years ago
feld 25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop'
5 years ago
Haelwenn e32d099a3a Merge branch 'feature/poll-refresh' into 'develop'
5 years ago
rinpatch 5028b7b578 Fix credo issues
5 years ago
rinpatch c096dd86e5 Do not refetch local objects
5 years ago
rinpatch eb87a86b5b Preserve internal fields when reinjecting
5 years ago
rinpatch d32894ae51 Move object internal fields to a constant
5 years ago
rinpatch e3f902b3a1 Set updated_at even if the object stayed the same
5 years ago
rinpatch a9c700ff15 Fix wrong argument order when calling NaiveDateTime.diff
5 years ago
rinpatch 7ef575d11e Initial poll refresh support
5 years ago
Maxim Filippov 384b7dd40d Fix response
5 years ago
Maxim Filippov f89728ad95 Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Ivan Tashkinov e4f3d7f69d Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
5 years ago
Ivan Tashkinov 551f2fa59e [#1234] Added changelog entry, removed admin OAuth scopes.
5 years ago
Ivan Tashkinov c98e761d28 Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Alex S a18f1e7cd7 namings
5 years ago
Alex S 2263c8b6b9 little fixes
5 years ago
Alex S 4faf2b1555 post for creating invite tokens in admin api
5 years ago
Haelwenn (lanodan) Monnier e501c822c9
markdown.ex: put two-spaces before the description-newline
5 years ago
Haelwenn (lanodan) Monnier 4785596a2c
markdown.ex: end suggestions list with a newline
5 years ago
Haelwenn (lanodan) Monnier d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
5 years ago
Haelwenn (lanodan) Monnier d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
5 years ago
Haelwenn (lanodan) Monnier c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
Haelwenn (lanodan) Monnier 106afaed58
markdown.ex: do not fail if there is no children
5 years ago
Haelwenn (lanodan) Monnier e0d8c8897e
docs/markdown.ex: do no print empty suggestions
5 years ago
Ivan Tashkinov b4d775161c [#1234] Undone reordering-related changes in router.ex.
5 years ago
Maxim Filippov f9dd121ad3 Admin API: Return link alongside with token on password reset
5 years ago
Ivan Tashkinov 01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Haelwenn (lanodan) Monnier 7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
5 years ago
Maksim Pechnikov 0447c42715 Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov 76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
rinpatch ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop'
5 years ago
Maksim Pechnikov 7dd51652f9 Merge branch 'develop' into issue/733
5 years ago
Steven Fuchs 6193157f19 Fix notification warnings
5 years ago
Haelwenn 2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
5 years ago
rinpatch 95a4a19417 Merge branch 'support/tests' into 'develop'
5 years ago
Steven Fuchs 80c5c3495b remove remaining errors from tests
5 years ago
Roman Chvanikov 9fa2586abd Refactor SubscriptionNotificationView
5 years ago
Roman Chvanikov e9f69a3eb7 Move pleroma_api controllers into controllers sub-folders
5 years ago
Roman Chvanikov 7d1773bc6b Rename SubscriptionNotificationController list and get actions to index and show
5 years ago
Roman Chvanikov a76168e743 Cleanup PleromaAPIController
5 years ago
Roman Chvanikov a81f80233d Apply suggestion to lib/pleroma/web/router.ex
5 years ago
Roman Chvanikov f9be517c7f Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Roman Chvanikov c0f776faec Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Roman Chvanikov 2688b876ab Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Ivan Tashkinov e7afb67c5c [#1260] Rate-limiting for create authentication and related requests.
5 years ago
eugenijm 450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
rinpatch a21584556f Update oban to 0.8.1
5 years ago
Roman Chvanikov 6042e21b25 Move subscription notifications to a separate controller
5 years ago
Roman Chvanikov 56b60798c2 Code style fixes
5 years ago
Roman Chvanikov 76c3e290fc Merge develop
5 years ago
Maxim Filippov df15ed13d1 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Egor Kislitsyn 085d014f08 Fix `Transmogrifier.upgrade_user_from_ap_id/1`
5 years ago
Maxim Filippov 219dca1b00 Merge branch 'develop' into feature/return-total-for-reports
5 years ago
Egor Kislitsyn 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
5 years ago
kaniini c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
5 years ago
Steven Fuchs aab264db82 Streamer refactoring
5 years ago
kaniini 17142a3720 Merge branch 'feature/delivery-tracking' into 'develop'
5 years ago
kaniini d1a84ceec8 Merge branch 'feature/optimize_rich_media_parser' into 'develop'
5 years ago
Maksim Pechnikov d75bc728e7 Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ivan Tashkinov e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
Maksim Pechnikov b4cf74c106 added prepare html for RichMedia.Parser
5 years ago
Maksim Pechnikov 8751809e1e Merge branch 'develop' into support/tests
5 years ago
Ivan Tashkinov 610236d6be [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch 9c64a25713 Merge branch 'config-changes' into 'develop'
5 years ago
rinpatch 62bbba80f3 Merge branch 'fix/truncate-remote-user-fields' into 'develop'
5 years ago
Roman Chvanikov d7457c9165 Merge branch 'develop' into refactor/subscription
5 years ago
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch 5c5ebd3861 Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
lain 1be09bde2d Merge branch 'refactor/add_link_headers' into 'develop'
5 years ago
rinpatch ba70a8cae6 Merge branch 'develop' into feature/delivery-tracking
5 years ago
rinpatch ac4a748fad Disallow NULLs in deliveries
5 years ago
Alex S 69faec031d markdown generation to the new file
5 years ago
Roman Chvanikov 0bd2b85edb Separate Subscription Notifications from regular Notifications
5 years ago
rinpatch 8900cb68ae Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch 05f8a066a1 Apply suggestion to lib/pleroma/delivery.ex
5 years ago
rinpatch 2784962dba Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
lain 53a3ad6043 Merge branch 'cleanup-activity' into 'develop'
5 years ago
Haelwenn 0d9609894f Merge branch 'feature/change-email' into 'develop'
5 years ago
rinpatch f884987ace Merge branch 'admin-config-description' into 'develop'
5 years ago
rinpatch 3896a51b8a Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch 5170170483 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch fb96facc32 Remove unused functions and fix credo issues
5 years ago
rinpatch ce23529d91 Use delivery info when federating deletes
5 years ago
Egor Kislitsyn 25d8216804 Add email change endpoint
5 years ago
Egor Kislitsyn 39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
5 years ago
Maksim Pechnikov d8a178274b fix Activity.get_by_id
5 years ago
Maksim Pechnikov 2b40e57a72 Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
Haelwenn 51609217c2 Merge branch 'fix/error-log-double-quotes' into 'develop'
5 years ago
rinpatch b0e6058021 Parse http signature for request to objects/activities
5 years ago
Maksim Pechnikov 936951826e Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch dabc4a00f5 Put the cache with the right key when using a tracking function
5 years ago
rinpatch 769fb778d4 Track object/create activity fetches
5 years ago
Maksim Pechnikov 4f548cb2b7 added test for Ostatus
5 years ago
Mark Felder 74e4c72c4a Fix double quotes in error logs
5 years ago
Maksim Pechnikov 007e0c1ce1 added tests
5 years ago
rinpatch 56828abf6d Use Jason for rendering responses
5 years ago
Haelwenn 46ae62d159 Merge branch 'patch-5' into 'develop'
5 years ago
lain fb7332aec7 Merge branch 'fix/oom-parallel-rendering' into 'develop'
5 years ago
Alex S be32d90a0c little refactor
5 years ago
Alex S 5ff12e7df1 some changes
5 years ago
Alex S 35757b6d0e don't add behaviour to suggestions
5 years ago
Alex S 0624e06a9c little fix
5 years ago
Alex S 6721301086 some changes
5 years ago
Alex S a1f2dfb10a expanding regex sigils to use modifiers
5 years ago
Alex S 67e4300931 description formatters
5 years ago
Maksim Pechnikov fcf604fa43 added tests
5 years ago
rinpatch 43f02dfe38 Revert "Parallelize template rendering"
5 years ago
Maksim Pechnikov a31af93e1d added tests /activity_pub/transmogrifier.ex
5 years ago
Egor Kislitsyn b40b10b53d Add an endpoint to get multiple statuses by IDs
5 years ago
Maxim Filippov d1abf7a358 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
minibikini 11e12b5761 Add Pleroma.Plugs.Cache
5 years ago
feld edbaf78176 Merge branch 'fix/read-inbox' into 'develop'
5 years ago
Egor Kislitsyn e0f84d0043 Fix `ActivityPubController.read_inbox/2`
5 years ago
Ivan Tashkinov b63faf9819 [#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
Ivan Tashkinov c3f00447af Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
shadowfacts e5c6bf3673 Mastodon API: URI encode hashtag name in generated URLs
5 years ago
Maksim Pechnikov 8c6cdff3cc Merge branch 'develop' into issue/1218
5 years ago
Maksim Pechnikov 39f99dc6cd Merge branch 'develop' into support/tests
5 years ago
Ariadne Conill 40a61532ca activity: when restricting deactivated users, precalculate the user list
5 years ago
Ariadne Conill 5effb2cbca activitypub: help ecto build a better query for thread mute filtering
5 years ago
Maksim Pechnikov ab2f21e470 tests for mastodon_api_controller.ex
5 years ago
Maksim Pechnikov eb74c3d5c7 Merge branch 'develop' into issue/1218
5 years ago
Ivan Tashkinov ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Egor Kislitsyn 40b3289c26 Refactor `add_link_headers/7` -> `add_link_headers/3`
5 years ago
rinpatch 896ffabe37 Merge branch 'so-long-twitterapi' into 'develop'
5 years ago
rinpatch 3523bdcf26 Call TrailingFormatPlug for /api/pleroma/emoji
5 years ago
Maxim Filippov 736165c082 Reverse reports list
5 years ago
Haelwenn fe7cf44c40 Merge branch 'feature/mastoapi-accounts-external' into 'develop'
5 years ago
rinpatch 26fe6f70c9 Move checking for restrict_local to User.get_cached_by_id_or_nickname
5 years ago
rinpatch b312ca3d52 Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
Ivan Tashkinov 79cf629e1a Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch 3e30f6e198 Merge branch 'fix/safe-render-notifications' into 'develop'
5 years ago
rinpatch 558969a0fd Do not crash if one notification failed to render
5 years ago
Maksim Pechnikov ae506ca997 fix formatting
5 years ago
Maksim e2011a667c Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
Maksim 8306078de1 Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
Maxim Filippov af746fa4a8 Return total for reports
5 years ago
Maxim Filippov 3542ca6702 Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Sadposter cb99cfcc65 don't try to truncate non-strings
5 years ago
Sadposter 2975da284b truncate remote user bio/display name
5 years ago
Maksim Pechnikov a890451187 fetch_announcements -> take_announcements
5 years ago
Maksim Pechnikov 8cbad5500c add tests for activity_pub/utils.ex
5 years ago
rinpatch 3face45467 Mastodon API: Add `pleroma.thread_muted` to Status entity
5 years ago
rinpatch 7c3838090f Apply suggestion to lib/pleroma/notification.ex
5 years ago
rinpatch c2b6c1b089 Extend `/api/pleroma/notifications/read` to mark multiple notifications
5 years ago
rinpatch cc1d1ee406 Mastdon API: Add ability to get a remote account by nickname to
5 years ago
Ivan Tashkinov eb17cc17a1 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Maxim Filippov b15cfd80ef Return "total" optionally
5 years ago
Maxim Filippov a4c5f71e93 Return total from pagination + tests
5 years ago
Ivan Tashkinov b49085c156 [#1149] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
Sadposter d0f07e55d2 use atom key for fields
5 years ago
Sadposter 05c935c396 mix format
5 years ago
Sadposter 35ef470d00 truncate fields for remote users instead
5 years ago
Maxim Filippov 9c96b17e16 Add pagination to logs
5 years ago
Ivan Tashkinov dd017c65a4 [#1149] Refactored Oban workers API (introduced `enqueue/3`).
5 years ago
Ivan Tashkinov a90ea8ba15 [#1149] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
Ivan Tashkinov e890ea7e82 [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch 70eed0594c credo fixes
5 years ago
rinpatch bd3ed3a622 Add back /api/qvitter/statuses/notifications/read.json
5 years ago
rinpatch 64410497d2 Remove TwitterAPI representers
5 years ago
rinpatch 985122cc03 Remove Activity, User and Notification views from TwitterAPI
5 years ago
rinpatch 90c2dae9a4 Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
5 years ago
Maksim Pechnikov 6ef0103ca0 added Emoji struct
5 years ago
Maxim Filippov 4d6e22bb9b Style
5 years ago
Maxim Filippov f182f0f6bd Add ability to search moderation logs
5 years ago
Maksim Pechnikov d8098d142a added Emoji.Formatter
5 years ago
Maksim 5c90b70733 Apply suggestion to lib/pleroma/emoji/loader.ex
5 years ago
Maksim Pechnikov d7808b5db4 added code\path fields without html tags in ets
5 years ago
Maksim Pechnikov cef2e980b1 division emoji.ex on loader.ex and emoji.ex
5 years ago
feld 7853b3f17d Fix AntiFollowbotPolicy when trying to follow a relay
5 years ago
Haelwenn d9d7765383 Merge branch 'fix-osada-follow' into 'develop'
5 years ago
lain 66519f2100 Merge branch 'list-controller' into 'develop'
5 years ago
Maxim Filippov 5e4fde1d3d Filter logs by date
5 years ago
Maksim ffcd742aa0 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
lain c30cc039e4 Transmogrifier: Use Containment.get_actor to get actors.
5 years ago
Maksim Pechnikov 00abe099cd added tests for ActivityPub.like\unlike
5 years ago
Ivan Tashkinov cd78e63a25 [#1149] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with WebsubServerSubscription.
5 years ago
rinpatch eb1739c596 Remove most of TwitterAPIController
5 years ago
lain 3da65292b3 Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
Egor Kislitsyn 4194abbc8f Move mastodon_api/*_controller.ex to mastodon_api/controllers/
5 years ago
Egor Kislitsyn 30510ade0e Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
Egor Kislitsyn 4d82bc8b0b Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
5 years ago
Egor Kislitsyn 3b1b631c2a Add validation in Pleroma.List.create/2
5 years ago
kPherox 8ca4f145a5
Extract if block into private function
5 years ago
kaniini 6dc24422dc Merge branch 'issue/1177' into 'develop'
5 years ago
Maxim Filippov 37dd3867bb Log admin/moderator actions
5 years ago
kaniini 503139b343 Merge branch 'fix-all-custom-fields-deleted' into 'develop'
5 years ago
kPherox b15e226593
Change to delete empty name field
5 years ago
kPherox 705b5adfc4
Fix type of fields_attributes
5 years ago
kPherox 45e21a9df4
Rename fields to fields_attributes
5 years ago
kPherox 3549cd9754
Change to use attachment only when fields do not exist
5 years ago
lain 90986667ce Merge branch 'admin-create-users' into 'develop'
5 years ago
lain efb8818e9e Activity Expiration: Switch to 'expires_in' system.
5 years ago
lain 1692fa8945 ActivityExpirationWorker: Fix merge issues.
5 years ago
Maksim Pechnikov 654d291b6d update tests
5 years ago
Maksim Pechnikov 6062017493 put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
5 years ago
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov 581123f8bb [#1149] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
Ivan Tashkinov c056736daa [#1149] Publisher worker fix (atomized `params` keys).
5 years ago
Ivan Tashkinov c29686309e [#1149] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
Maksim Pechnikov 8dc6a6b210 fix /inbox for Relay
5 years ago
Maksim Pechnikov 399ca9133b fix test
5 years ago
Maksim Pechnikov f95b67c933 Merge branch 'develop' into issue/1177
5 years ago
Ivan Tashkinov 7101ba1a21 Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Egor Kislitsyn a79ebac592 Improve AP routes rate limit
5 years ago
Maksim Pechnikov 64bfb41c55 fixed unfollow for relay actor
5 years ago
Sachin Joshi 37229af15f remove old user create and delete routes for admin
5 years ago
lain f740d786a3 Merge branch 'rate-limit-ap-routes' into 'develop'
5 years ago
lain 74f7f308f8 Merge branch 'fix/admin-api-user-deletion' into 'develop'
5 years ago
Egor Kislitsyn 8d899d6197 Add `:ap_routes` rate limit
5 years ago
lain 8340fe8fcc Merge branch 'digest-template' into 'develop'
5 years ago
lain ef43016b2c Merge branch 'feature/custom-fields' into 'develop'
5 years ago
Maxim Filippov 5171aa5b4d Refactor check_actor_is_active
5 years ago
lain d2c9befc64 Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
5 years ago
Sergey Suprunenko 75a5dd41ee Add more tests for Database tasks and DigestEmailWorker
5 years ago
lain 49ae3191df Merge branch 'hotfix/user_unfollow' into 'develop'
5 years ago
kaniini 475fcb3e6c Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
5 years ago
kaniini 18c8c8d176 Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
5 years ago
Sadposter 94e336d9d5 clear follow requests when blocking a user
5 years ago
Mark Felder ef82f868d9 Formatting
5 years ago
Maksim Pechnikov 3315a2a1c3 fixed User.unfollow with synchronization external user
5 years ago
lain 7ab2dbbdb6 Merge branch 'pleroma-conversations' into 'develop'
5 years ago
Egor Kislitsyn 158231cd20 Add configurable colors and logo for the digest template
5 years ago
Mark Felder 6a3b1a526e max_body_size -> max_body_length, as it should be
5 years ago
rinpatch fba3c16d20 Fix OAuth cleanup worker unconditionally starting
5 years ago
kaniini 1c8f58a30e Merge branch 'features/formatting-sub_sup' into 'develop'
5 years ago