summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-11Deprecate Pleroma.Web.RichMedia.Parsers.OGPEgor Kislitsyn
2020-06-11Merge 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-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 branch '1794-hashtags-construction-from-uri' into 'develop'feld
[#1794] Hashtags search fix for URI as query string Closes #1794 See merge request pleroma/pleroma!2641
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-10ActivityPubTest: Update test for atomized parameters.lain
2020-06-10Add testThibaut Girka
2020-06-10Merge branch 'remake-remodel-dms' into 'develop'rinpatch
Chats / ChatMessages See merge request pleroma/pleroma!2429
2020-06-10ActivityPubTest: Make test easier to understand.lain
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 'release/2.0.6' into 'stable'rinpatch
Release/2.0.6 See merge request pleroma/pleroma!2632
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 'features/mediatype-mime-valid' into 'develop'lain
transmogrifier: MIME.valid?/1 for mediaType See merge request pleroma/pleroma!2634
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-08CHANGELOG.md: add 2.0.6 entryrinpatch
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-08Merge branch 'activity-pub-use-atoms-as-keys' into 'develop'lain
Use atoms as keys in `ActivityPub.fetch_*` options See merge request pleroma/pleroma!2629
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-08mix.exs: bump version to 2.0.6rinpatch
2020-06-08Merge branch 'recipients-query-speedup' into 'develop'rinpatch
Greatly speed up recipients query See merge request pleroma/pleroma!2558
2020-06-08Migrations: Add index on client_id and client_secret for apps.lain
Greatly speeds up app lookup.
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
2020-06-08[stable rewrite]: fix streamer streaming out announces from a muted threadrinpatch
Use parent object instead of activity because context is null of Announce activity from Mastodon.
2020-06-08Merge branch 'features/apc2s-pagination' into 'develop'Haelwenn
Fix AP C2S pagination Closes #866 and #751 See merge request pleroma/pleroma!2491
2020-06-08Update crypt libraryRoman Chvanikov
2020-06-08fix for syslog compile with updated rebar3Alexander Strizhakov
2020-06-08[stable rewrite] update hackney to 1.16.0 and add support for tlsv1.3rinpatch