aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-05-29Bugfix: Reuse Controller.Helper pagination for APC2SHaelwenn (lanodan) Monnier
2020-05-29Merge branch 'fix-relay-repeat-notification' into 'develop'lain
Fix relay repeat notification See merge request pleroma/pleroma!2590
2020-05-29Use `User.is_internal_user?` insteadkPherox
2020-05-29Don't make relay announce notificationkPherox
2020-05-29Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'rinpatch
Fix profile emojis bypassing mediaproxy and harden CSP Closes #1810 See merge request pleroma/pleroma!2596
2020-05-28Add OpenApi spec to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-28remove deleted media urls from cacheMaksim Pechnikov
2020-05-28Move config actions to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain
Validate actor type See merge request pleroma/pleroma!2593
2020-05-28Update default instance descriptionAlex Gleason
2020-05-28update attachments_cleanup_worker.exMaksim Pechnikov
2020-05-27Fix minor spelling errorMark Felder
2020-05-27AccountView: Use mediaproxy URLs for emojisrinpatch
Also use atom keys in emoji maps instead of binaries Closes #1810
2020-05-27Exclude post actor from to of relay announcekPherox
2020-05-27Merge branch 'refactor-add-mention-step-one' into 'develop'rinpatch
Fix ObjectView calling into strange functions Closes #1807 See merge request pleroma/pleroma!2580
2020-05-27Apply suggestion to ↵Alexander Strizhakov
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-05-27Fix typoEgor Kislitsyn
2020-05-27Merge branch 'fav-speedup' into 'develop'lain
ActivityPub: Change ordering to `nulls last` in favorites query See merge request pleroma/pleroma!2594
2020-05-27ActivityPub: Change ordering to `nulls last` in favorites querylain
This makes it use our existing index and speeds up the query.
2020-05-27validate actor typeAlexander Strizhakov
2020-05-26Merge branch 'develop' into fix/mediaproxy-http-invalidationMaksim Pechnikov
2020-05-26Mastodon API Controllers: Use the correct params for rate limiting.lain
2020-05-26Add AdminAPI.InviteViewEgor Kislitsyn
2020-05-26Add OpenAPI spec for AdminAPI.InviteTokenControllerEgor Kislitsyn
2020-05-26Move invite actions to AdminAPI.InviteTokenControllerEgor Kislitsyn
2020-05-26another view for account in admin-fe status_showAlexander Strizhakov
2020-05-26fix testsMaksim Pechnikov
2020-05-25[#1501] Made user feed contain public and unlisted activities.Ivan Tashkinov
2020-05-25Add OpenAPI spec for AdminAPI.OAuthAppContollerEgor Kislitsyn
2020-05-25added `deleted_urls_cache`Maksim Pechnikov
2020-05-25Transmogrifier: Use a simpler way to get mentions.lain
2020-05-25Add OpenAPI spec for AdminAPI.RelayControllerEgor Kislitsyn
2020-05-25Merge branch 'openapi/admin/status' into 'develop'lain
Add OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2566
2020-05-24Merge branch 'mastodon-migration-compat' into 'develop'rinpatch
Add compatibility routes for converted mastodon instances Closes #1797 See merge request pleroma/pleroma!2572
2020-05-23fix mediaproxy invalidationsMaksim Pechnikov
2020-05-22Fix MediaProxy Invalidation for Http methodMark Felder
2020-05-22Merge branch 'feature/configure-filename-truncate' into 'develop'lain
Configurable filename truncation threshold Closes #1799 See merge request pleroma/pleroma!2573
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
EmojiReactionController: Return more appropriate error. See merge request pleroma/pleroma!2569
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
Announce validator See merge request pleroma/pleroma!2567
2020-05-22Merge branch '1113-op-mentioning' into 'develop'Haelwenn
CommonAPI: Change public->private implicit addressing. Closes #1113 See merge request pleroma/pleroma!2563
2020-05-21Merge branch 'admin-logo-upload' into 'develop'lain
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image See merge request pleroma/pleroma!2388
2020-05-21Merge branch 'features/emoji_stealer' into 'develop'lain
MRF.StealEmojiPolicy: New Policy See merge request pleroma/pleroma!2385