aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-12Merge branch 'release/2.2.0' into 'stable'v2.2.0rinpatch
Release/2.2.0 See merge request pleroma/secteam/pleroma!19
2020-11-11pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983adrinpatch
2020-11-11Polish the changelog a bit and specify release daterinpatch
2020-11-11changes after rebaseAlexander Strizhakov
2020-11-05CHANGELOG.md: Add an entry for the spoofing fixrinpatch
2020-11-05Merge branch 'fix/object-attachment-spoof' into 'develop'rinpatch
Fix object spoofing vulnerability in attachments See merge request pleroma/secteam/pleroma!18
2020-11-05Merge branch '2236-no-name' into 'develop'Haelwenn
Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101
2020-11-05phoenix_controller_render_duration is no longer available in telemetry of ↵Mark Felder
Phoenix 1.5+
2020-11-05Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' ↵feld
into 'develop' OStatus / Static FE access control fixes See merge request pleroma/pleroma!3053
2020-11-05Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
[#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093
2020-11-05Merge branch '2242-nsfw-case' into 'develop'rinpatch
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094
2020-11-05Merge branch 'issue/2261' into 'develop'feld
[#2261] FrontStatic plug: excluded invalid url See merge request pleroma/pleroma!3106
2020-11-04Merge branch '2257-self-chat' into 'develop'rinpatch
Resolve "Can't message yourself in a chat (but can start it)" Closes #2257 See merge request pleroma/pleroma!3099
2020-11-04Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-11-04Merge branch 'instance-docs' into 'develop'feld
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API Closes #1516 See merge request pleroma/pleroma!2931
2020-11-04Merge branch 'tesla-get-to-pleroma' into 'develop'feld
Use Pleroma.HTTP instead of Tesla Closes #2275 See merge request pleroma/pleroma!3113
2020-10-21Rip out fedsockets from the release branchrinpatch
2020-10-15SECURITY.md: update supported versions to only 2.2rinpatch
2020-10-15CHANGELOG.md: prepare 2.2.0 changelogrinpatch
2020-10-15mix.exs: bump version to 2.2.0rinpatch
2020-10-14Merge branch 'docs-indigenous' into 'develop'feld
Change handle and url of contact person for Indigenous client See merge request pleroma/pleroma!3082
2020-10-14Change handle and url of contact person for Indigenous clientswentel
2020-10-14Merge branch 'feature/gen-magic' into 'develop'feld
Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534
2020-10-14Merge branch 'refactor/locked_user_field' into 'develop'Haelwenn
Change user.locked field to user.is_locked See merge request pleroma/pleroma!3077
2020-10-14Undo API breaking changesMark Felder
2020-10-13Missed testsMark Felder
2020-10-13Merge branch 'bugfix/file-consistency-prod' into 'develop'Haelwenn
Move Consistency.FileLocation to ./test See merge request pleroma/pleroma!3079
2020-10-13Move Consistency.FileLocation to ./testHaelwenn (lanodan) Monnier
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
2020-10-13CredoMark Felder
2020-10-13JPEG content_type must be image/jpegMark Felder
2020-10-13Merge branch 'develop' into feature/gen-magicMark Felder
2020-10-13Merge branch 'develop' into refactor/locked_user_fieldMark Felder
2020-10-13Merge branch 'feature/1822-files-consistency' into 'develop'feld
Feature/1822 files consistency Closes #1822 See merge request pleroma/pleroma!2680
2020-10-13Change user.locked field to user.is_lockedMark Felder
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13migration and warning for RemoteIp plug renameAlexander Strizhakov
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13credo fix after rebaseAlexander Strizhakov
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13fixes after rebaseAlexander Strizhakov
2020-10-13rebaseAlexander Strizhakov
2020-10-13changes after rebaseAlexander Strizhakov
2020-10-13fixes after rebaseAlexander Strizhakov
2020-10-13exclude file_location check from coverallsAlexander Strizhakov
2020-10-13fix after rebaseAlexander Strizhakov
2020-10-13files consistency after rebaseAlexander Strizhakov
2020-10-13files consistency for new filesAlexander Strizhakov
2020-10-13fix after rebaseAlexander Strizhakov
2020-10-13update files consistency after rebaseAlexander Strizhakov
2020-10-13copyrightAlexander Strizhakov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-21 13:59:18 +0000