summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-30Merge branch 'chore/bump-hackney' into 'develop'Haelwenn
mix.lock: update hackney to 1.16.0 Closes #1612 See merge request pleroma/pleroma!2614
2020-05-30Merge branch 'test/fix-config-setting-in-user-test' into 'develop'lain
Fix config setting to not affect other tests See merge request pleroma/pleroma!2615
2020-05-30Fix config setting to not affect other testsRoman Chvanikov
2020-05-30hackney adapter helper: support tlsv1.3 and remove custom optsrinpatch
- partitial_chain is no longer exported, but it seems to be the default anyway. - The bug that caused sni to not be sent automatically seems to be fixed - https://github.com/benoitc/hackney/issues/612
2020-05-30Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-30CommonAPI: Linkify chat messages.lain
2020-05-30SafeText: Let through basic html.lain
2020-05-30Merge branch 'conversation-pagination' into 'develop'lain
Conversation pagination See merge request pleroma/pleroma!2601
2020-05-30Conversation paginationSteven Fuchs
2020-05-30[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a ↵Ivan Tashkinov
test.
2020-05-30Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
fix/1794-hashtag-search-results
2020-05-29Merge branch 'bugfix/csp-unproxied' into 'develop'rinpatch
http_security_plug.ex: Fix non-proxied media See merge request pleroma/pleroma!2610
2020-05-29Merge branch 'media-docs' into 'develop'rinpatch
Docs: Attachement limitations in MastoAPI differences See merge request pleroma/pleroma!2607
2020-05-30mix.lock: update hackney to 1.16.0rinpatch
Closes #1612
2020-05-29Apply suggestion to lib/pleroma/plugs/http_security_plug.exrinpatch
2020-05-29Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'lain
fix unused var warning in streamer test See merge request pleroma/pleroma!2612
2020-05-29fix unused var warningRoman Chvanikov
2020-05-29Merge branch 'connect-src' into 'develop'rinpatch
Add blob: to connect-src CSP, fixes #1827 Closes #1827 See merge request pleroma/pleroma!2608
2020-05-29[#1794] Improvements to hashtags extraction from search query.Ivan Tashkinov
2020-05-29preload data into index.htmlstwf
2020-05-29Add blob: to connect-src CSPAlex Gleason
2020-05-29Merge branch 'fix-streaming' into 'develop'lain
Fix argument error in streamer See merge request pleroma/pleroma!2609
2020-05-29Merge branch 'mix/database-vacuum-options' into 'develop'feld
Database vacuum mix task See merge request pleroma/pleroma!2599
2020-05-30Add test for stream boosts of mastodon userkPherox
2020-05-30Fix argument error in streamerkPherox
`Repo.exists` can't use `nil` as it is unsafe. Use parent object instead of activity because currently Announce activity's context is null.
2020-05-29http_security_plug.ex: Fix non-proxied mediaHaelwenn (lanodan) Monnier
2020-05-29Document new database vacuum tasksMark Felder
2020-05-29AP C2S: allow limit & order on outbox & read_inboxHaelwenn (lanodan) Monnier
2020-05-29Bugfix: router: allow basic_auth for outboxHaelwenn (lanodan) Monnier
2020-05-29Bugfix: Reuse Controller.Helper pagination for APC2SHaelwenn (lanodan) Monnier
2020-05-29Docs: Also add the streaming docs to the Chat api doc.lain
2020-05-29SideEffects: Ensure a chat is present before streaming something out.lain
2020-05-29Docs: Document streaming differenceslain
2020-05-29StreamerView: Actually send Chats, not ChatMessages.lain
2020-05-29SideEffects: Stream out chat messages.lain
2020-05-29Streamer: Add a chat message stream.lain
2020-05-29Merge branch 'fix-relay-repeat-notification' into 'develop'lain
Fix relay repeat notification See merge request pleroma/pleroma!2590
2020-05-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-29Use `User.is_internal_user?` insteadkPherox
2020-05-29Don't make relay announce notificationkPherox
2020-05-29Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'rinpatch
Fix profile emojis bypassing mediaproxy and harden CSP Closes #1810 See merge request pleroma/pleroma!2596
2020-05-29HTTP Security plug: make starting csp string generation more readablerinpatch
2020-05-28Docs: Attachement limitations in MastoAPI differencesAlex Gleason
2020-05-28Migrate old notification settings to new variantsMark Felder
2020-05-28Add OpenApi spec to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-28Move config actions to AdminAPI.ConfigControllerEgor Kislitsyn
2020-05-28FormattingMark Felder
2020-05-28Merge branch 'fix/1557-gets-local-pack' into 'develop'lain
get-packs for local generated pack Closes #1557 See merge request pleroma/pleroma!2604
2020-05-28Merge branch 'feature/1792-update-actor-type' into 'develop'lain
Validate actor type See merge request pleroma/pleroma!2593
2020-05-28Update default instance descriptionAlex Gleason
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 03:32:14 +0000