summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-22fix for elixir 1.11Alexander Strizhakov
load runtime configs in releases with config provider
2020-12-22SideEffects: fix testlain
2020-12-22User: Remove left-over (wrong) fix.lain
2020-12-22User: Don't allow local users in remote changesetslain
2020-12-22Switch to a fork of Hackney 1.15.2 for now so we can have our URL ↵Mark Felder
normalization bugfix
2020-12-22Update changeloglain
2020-12-22Search: Only skip ordering the rum index.lain
2020-12-22Activity search: Fix order of resultslain
Greatly speeds up the search for RUM.
2020-12-22Document fixing the pleroma.user delete_activities mix taskMark Felder
2020-12-22Need to start web_resp cache or mix task failsMark Felder
2020-12-22Document S3 and Elixir 1.11 compat fixMark Felder
2020-12-22Fix S3 uploads with Elixir 1.11Mark Felder
2020-12-22pleroma.instance: Fix Exiftool module nameHaelwenn (lanodan) Monnier
2020-12-22remove PurgeExpiredActivity from Oban db configAlexander Strizhakov
2020-11-21Merge branch 'cherry-pick-a65fc78c' into 'stable'feld
Dockerfile fixes for stable See merge request pleroma/pleroma!3169
2020-11-21Install file-dev in Dockerfile build stageMichael Walker
This is required by the majic, added in #2534.
2020-11-21Merge branch 'libmagic' into 'develop'feld
Add missing libmagic for image upload to dockerfile See merge request pleroma/pleroma!3168 (cherry picked from commit a65fc78c6a14e1333ce71d28824a490a8a6da69b) e6af7dc7 Add missing libmagic for image upload
2020-11-20Merge branch 'cherry-pick-8a7ee9fe' into 'stable'feld
Merge branch 'revert-da4660d2' into 'stable' See merge request pleroma/pleroma!3166
2020-11-20Merge branch 'revert-da4660d2' into 'develop'feld
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'" See merge request pleroma/pleroma!3158 (cherry picked from commit 8a7ee9fe74f64680da366b0da51038bed022061b) 42ff5ea9 Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
2020-11-18Update AdminFE build to ↵Mark Felder
pleroma/admin-fe@c18f167a124c31ab2e1dfbf432ac482b17c01cbd
2020-11-12Merge branch 'build-release/fix-release-builds' into 'stable'rinpatch
.gitlab-ci.yml: Add libmagic to installed packages for OTP releases See merge request pleroma/pleroma!3134
2020-11-12.gitlab-ci.yml: Add libmagic to installed packages for OTP releasesrinpatch
2020-11-12Merge branch 'release/2.2.0' into 'stable'rinpatch
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 05:31:47 +0000