aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
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 'develop' into preload-dataMark Felder
2020-06-12Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'feld
HTTP security plug: add media proxy base url host to csp See merge request pleroma/pleroma!2638
2020-06-12Merge branch 'bugfix/csp-unproxied' into 'develop'rinpatch
http_security_plug.ex: Fix non-proxied media See merge request pleroma/pleroma!2610
2020-06-12static-fe.css: Restore and move to /priv/static/static-feHaelwenn (lanodan) Monnier
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-12Remove use of atoms in MRF.UserAllowListPolicyhref
2020-06-12Fix atom leak in Rich Media ParserEgor Kislitsyn
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-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-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-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-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
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-08Merge branch 'recipients-query-speedup' into 'develop'rinpatch
Greatly speed up recipients query See merge request pleroma/pleroma!2558
2020-06-08Activity.Queries: Use correct actor restriction.lain
2020-06-08ActivityPub: Change ordering to `nulls last` in favorites querylain
This makes it use our existing index and speeds up the query.
2020-06-08Merge branch 'notification-fixes' into 'develop'rinpatch
Notification performance fixes See merge request pleroma/pleroma!2595