summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-12Apply suggestion to config/description.exslain
2020-06-12Merge branch 'features/mix-task-reset-mfa' into 'develop'feld
New mix task: pleroma.user reset_mfa <nickname> See merge request pleroma/pleroma!2643
2020-06-12Merge branch 'chore/bump-changelog' into 'develop'feld
Add changelog entry for emoji pack reload command See merge request pleroma/pleroma!2646
2020-06-12Document new mix task feature to reset mfaMark Felder
2020-06-12Merge branch 'develop' into features/mix-task-reset-mfaMark Felder
2020-06-12Add changelog entry for emoji pack reload commandMark 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-12Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'feld
[#1794] Fixes URI query handling for hashtags extraction in search Closes #1794 See merge request pleroma/pleroma!2645
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-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-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-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-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-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-07Docs: Document new mandatory parameter.lain
2020-06-07ChatController: Make last_read_id mandatory.lain
2020-06-07Delete pending follow requests on user deletionSergey Suprunenko
2020-06-07Docs: Update docs on mark as read.lain
2020-06-07ChatController: Add `last_read_id` option to mark_as_read.lain
2020-06-07SideEffects: Move streaming of chats to after the transaction.lain
2020-06-07Chats: Change id to flake id.lain
2020-06-07AttachmentValidator: Check if the mime type is valid.lain
2020-06-06Notfication: Add validation of notification typeslain
2020-06-06ChatController: Use new oauth scope *:chats.lain
2020-06-06Credo fixes.lain
2020-06-06Migrations: Move Notification migration code to helperlain