aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-06-17Merge branch 'features/users-raw_bio' into 'develop'rinpatch
2020-06-17credo fixAlexander Strizhakov
2020-06-16Merge branch '1866-last-status-stuff' into 'develop'Haelwenn
2020-06-16moving mrf settings from instance to separate groupAlexander Strizhakov
2020-06-16moving custom ecto types in context foldersAlexander Strizhakov
2020-06-16Mogrify args as custom tuplesAlexander Strizhakov
2020-06-16ActivityPub: When restricting to media posts, only show 'Creates'.lain
2020-06-15fix testsstwf
2020-06-15Merge branch 'develop' into issue/1855Maksim Pechnikov
2020-06-15Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-15added testsMaksim Pechnikov
2020-06-15Conversations: Return last dm for conversation, not last message.lain
2020-06-14fix invalidates media url'sMaksim Pechnikov
2020-06-14Mastodon API: ensure the notification endpoint doesn't return less than the r...eugenijm
2020-06-13Merge branch '1851-favorites-pagination' into 'develop'rinpatch
2020-06-13ControllerHelper: Always return id field.lain
2020-06-13Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-13Remove use of atoms in MRF.UserAllowListPolicyhref
2020-06-13Fix atom leak in Rich Media ParserEgor Kislitsyn
2020-06-12Merge branch 'develop' into preload-dataMark Felder
2020-06-12Merge branch 'recipients-experiments' into 'develop'Haelwenn
2020-06-12Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2Egor Kislitsyn
2020-06-12Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-12Merge branch 'global-status-expiration' into 'develop'lain
2020-06-12added admin api for MediaProxy cache invalidationMaksim Pechnikov
2020-06-12[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov
2020-06-11Deprecate Pleroma.Web.RichMedia.Parsers.OGPEgor Kislitsyn
2020-06-11Merge OGP parser with TwitterCardEgor Kislitsyn
2020-06-11[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Merge branch 'remake-remodel-dms' into 'develop'rinpatch
2020-06-10ActivityPub: Don't show announces of your own objects in timeline.lain
2020-06-10ControllerHelper: Fix wrong comparison.lain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-09Merge branch 'add-url-to-admin-account-view' into 'develop'lain
2020-06-09Add `url` field to AdminAPI.AccountViewEgor Kislitsyn
2020-06-09StatusController: Correctly paginate favorites.lain
2020-06-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-08transmogrifier: MIME.valid?/1 for mediaTypeHaelwenn (lanodan) Monnier
2020-06-08merge developRoman Chvanikov
2020-06-08Restrict ActivityExpirationPolicy to Notes onlyEgor Kislitsyn
2020-06-08Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-06-08Merge branch 'openapi/admin/relay' into 'develop'lain
2020-06-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-08ChatController: Remove nonsensical pagination.lain
2020-06-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-07ChatController: Make last_read_id mandatory.lain
2020-06-07ChatController: Add `last_read_id` option to mark_as_read.lain