aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-06-16Merge branch '1866-last-status-stuff' into 'develop'Haelwenn
Resolve "/api/v1/conversations returns the wrong `last_status`" Closes #1866 See merge request pleroma/pleroma!2647
2020-06-16namingAlexander Strizhakov
2020-06-16fix attemps to merge mapAlexander Strizhakov
2020-06-16Mogrify args as custom tuplesAlexander Strizhakov
2020-06-15Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsersEgor Kislitsyn
2020-06-15Conversations: Return last dm for conversation, not last message.lain
2020-06-14Mastodon API: ensure the notification endpoint doesn't return less than the ↵eugenijm
requested amount of records unless it's the last page
2020-06-13Merge branch '1851-favorites-pagination' into 'develop'rinpatch
StatusController: Correctly paginate favorites. Closes #1851 See merge request pleroma/pleroma!2636
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 'recipients-experiments' into 'develop'Haelwenn
ActivityPub: Don't show announces of your own objects in timeline. See merge request pleroma/pleroma!2637
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
Global status expiration See merge request pleroma/pleroma!2208
2020-06-12Merge branch 'develop' into features/mix-task-reset-mfaMark Felder
2020-06-12Merge branch 'feature/cli-reload-emoji' into 'develop'lain
Add command to reload emoji packs from cli for OTP users Closes #1814 See merge request pleroma/pleroma!2639
2020-06-12[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov
2020-06-11New mix task: pleroma.user reset_mfa <nickname>Haelwenn (lanodan) Monnier
2020-06-11Deprecate Pleroma.Web.RichMedia.Parsers.OGPEgor Kislitsyn
2020-06-11Check for media proxy base_url, not Upload base_urlMark Felder
2020-06-11Merge branch 'develop' into fix/csp-mediaproxy-base-urlMark Felder
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-10Add command to reload emoji packs from cli for OTP usersMark Felder
Not useful for source releases as we don't have a way to automate connecting to the running instance.
2020-06-10HTTP security plug: add media proxy base url host to csprinpatch
2020-06-10Merge branch 'remake-remodel-dms' into 'develop'rinpatch
Chats / ChatMessages See merge request pleroma/pleroma!2429
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
Add `url` field to AdminAPI.AccountView See merge request pleroma/pleroma!2633
2020-06-09Add `url` field to AdminAPI.AccountViewEgor Kislitsyn
2020-06-09StatusController: Correctly paginate favorites.lain
Favorites were paginating wrongly, because the pagination headers where using the id of the id of the `Create` activity, while the ordering was by the id of the `Like` activity. This isn't easy to notice in most cases, as they usually have a similar order because people tend to favorite posts as they come in. This commit adds a way to give different pagination ids to the pagination helper, so we can paginate correctly in cases like this.
2020-06-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-09Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-09MigrationHelper: Move notification backfilling to own module.lain
2020-06-08Apply suggestion to lib/pleroma/notification.exlain
2020-06-08transmogrifier: MIME.valid?/1 for mediaTypeHaelwenn (lanodan) Monnier
No issues with the rest of the network yet but this makes sure it will work once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429 is merged.
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
Add OpenAPI spec for AdminAPI.RelayController See merge request pleroma/pleroma!2579
2020-06-08Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'lain
Delete outgoing pending follow requests on user deletion See merge request pleroma/pleroma!2631
2020-06-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-08ChatController: Remove nonsensical pagination.lain
2020-06-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-06-07ChatController: Make last_read_id mandatory.lain