aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain
2020-05-27Fix minor spelling errorMark Felder
2020-05-27Merge branch 'refactor-add-mention-step-one' into 'develop'rinpatch
2020-05-27Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controlle...Alexander Strizhakov
2020-05-27Merge branch 'fav-speedup' into 'develop'lain
2020-05-27ActivityPub: Change ordering to `nulls last` in favorites querylain
2020-05-27validate actor typeAlexander Strizhakov
2020-05-26Mastodon API Controllers: Use the correct params for rate limiting.lain
2020-05-25[#1501] Made user feed contain public and unlisted activities.Ivan Tashkinov
2020-05-25Transmogrifier: Use a simpler way to get mentions.lain
2020-05-25Merge branch 'openapi/admin/status' into 'develop'lain
2020-05-24Merge branch 'mastodon-migration-compat' into 'develop'rinpatch
2020-05-22Merge branch 'feature/configure-filename-truncate' into 'develop'lain
2020-05-22Apply suggestion to lib/pleroma/web/common_api/utils.exRoman Chvanikov
2020-05-22Add filename_display_max_length configRoman Chvanikov
2020-05-22OStatusController: Add Mastodon activity compat route.lain
2020-05-22ActivityPubController: Add Mastodon activity compat route.lain
2020-05-22OStatusController: Add Mastodon compatibility route for objects.lain
2020-05-22Merge branch 'emoji-react-better-errors' into 'develop'rinpatch
2020-05-22Fix notifications mark as read APIEgor Kislitsyn
2020-05-22ActivityPubController: Add Mastodon compatibility route.lain
2020-05-22EmojiReactionController: Return more appropriate error.lain
2020-05-22Merge branch 'announce-validator' into 'develop'Haelwenn
2020-05-22Merge branch '1113-op-mentioning' into 'develop'Haelwenn
2020-05-21Merge branch 'admin-logo-upload' into 'develop'lain
2020-05-21Merge branch 'features/emoji_stealer' into 'develop'lain
2020-05-21Merge branch 'openapi/pleroma-api/pleroma' into 'develop'lain
2020-05-21Add OpenAPI spec for AdminAPI.StatusControllerEgor Kislitsyn
2020-05-21AnnounceValidator: Check for announcabilitylain
2020-05-21Credo fixes.lain
2020-05-21Announcements: Fix all tests.lain
2020-05-21SideEffects: Builed out Announce effects.lain
2020-05-21Move status actions to AdminAPI.StatusControllerEgor Kislitsyn
2020-05-21Added the ability to upload background, logo, default user avatar, instance t...eugenijm
2020-05-20Pipeline: Don't federate if federation is disabled.lain
2020-05-20Announcements: Handle through common pipeline.lain
2020-05-20Merge branch 'openapi/pleroma-api/emojis' into 'develop'lain
2020-05-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-va...lain
2020-05-20CommonAPI: Change public->private implicit addressing.lain
2020-05-20Add `background_image` to `InstanceOperation`Egor Kislitsyn
2020-05-20Move notification actions to PleromaAPI.NotificationControllerEgor Kislitsyn
2020-05-20Move conversation actions to PleromaAPI.ConversationControllerEgor Kislitsyn
2020-05-20Move reaction actions to EmojiReactionControllerEgor Kislitsyn
2020-05-20Add OpenAPI spec for PleromaAPI.PleromaAPIControllerEgor Kislitsyn
2020-05-20Merge branch 'exposed-background-image' into 'develop'Haelwenn
2020-05-20Merge branch 'issue/1509' into 'develop'lain
2020-05-20InstanceOperation: Add background image to examplelain
2020-05-19Fix summaryEgor Kislitsyn
2020-05-19Move Scrobble views to ScrobbleViewEgor Kislitsyn
2020-05-19Add OpenAPI spec for PleromaAPI.ScrobbleControllerEgor Kislitsyn