aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-11-17Merge branch 'fix/debian-install-libmagic-typo' into 'develop'rinpatch
2020-11-17Debian installation guide: fix libmagic header package namerinpatch
2020-11-17Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'rinpatch
2020-11-17Merge branch 'chores/tesla_1.4.0' into 'develop'rinpatch
2020-11-17Merge branch 'sync-stable/2.2.0' into 'develop'rinpatch
2020-11-17.gitattributes: Treat js/css/source maps as binary filesrinpatch
2020-11-17CHANGELOG.md: Use a period after every bullet point for unreleased sectionsrinpatch
2020-11-17CHANGELOG.md: Add back an entry for S3 fixrinpatch
2020-11-17Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
2020-11-17mix.exs: bump development version to 2.2.50 after 2.2.0 releaserinpatch
2020-11-17Import stable commits into develop after releasing 2.2.0rinpatch
2020-11-17ActivityPubController: Don't return local only objectslain
2020-11-17mix.exs: Update tesla to 1.4.0Haelwenn (lanodan) Monnier
2020-11-17Gitlab CI: Specify image architecture for arm64 imageslain
2020-11-17Added translation using Weblate (Hebrew)Guy Sheffer
2020-11-17Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'lain
2020-11-17Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'lain
2020-11-16Use absolute URLs to thumbnail and background in /api/v1/instanceMark Felder
2020-11-16Document S3 and Elixir 1.11 compat fixMark Felder
2020-11-16Fix S3 uploads with Elixir 1.11Mark Felder
2020-11-16added testMaksim Pechnikov
2020-11-16Hide reactions from muted and blocked usersEgor Kislitsyn
2020-11-16fix testsMaksim Pechnikov
2020-11-14Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason
2020-11-14Merge branch 'bugfix/instance-gen_exiftool' into 'develop'Haelwenn
2020-11-14pleroma.instance: Fix Exiftool module nameHaelwenn (lanodan) Monnier
2020-11-14added testMaksim Pechnikov
2020-11-13Gitlab CI: Change tags bag to arm32lain
2020-11-13Gitlab CI: Alpine is alpinelain
2020-11-13Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into '...lain
2020-11-13Make notifs view work for reportsIlja
2020-11-13Merge branch 'docs/otp-tuning' into 'develop'lain
2020-11-13Gitlab CI: Specify arm32v7 image for arm32 buildslain
2020-11-13added error messages for posix error codeMaksim Pechnikov
2020-11-13Merge branch 'fix/oban-in-database-config' into 'develop'rinpatch
2020-11-13remove PurgeExpiredActivity from Oban db configAlexander Strizhakov
2020-11-12Merge branch 'majic-dep' into 'develop'feld
2020-11-12Install file-dev in Dockerfile build stageMichael Walker
2020-11-12Merge branch 'build-release/fix-release-builds' into 'stable'rinpatch
2020-11-12.gitlab-ci.yml: Add libmagic to installed packages for OTP releasesrinpatch
2020-11-12Merge branch 'release/2.2.0' into 'stable'v2.2.0rinpatch
2020-11-12Fix object spoofing vulnerability in attachmentsrinpatch
2020-11-12Merge branch 'title-injection-change' into 'develop'Haelwenn
2020-11-11Merge branch 'feature/ingest-blurhash' into 'develop'feld
2020-11-11Fix tests for other attachment typesMark Felder
2020-11-11pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983adrinpatch
2020-11-11Polish the changelog a bit and specify release daterinpatch
2020-11-11Ingest blurhash field during transmogrificationMark Felder
2020-11-11Render blurhashes in Mastodon APIMark Felder
2020-11-11Ingest blurhash for attachments if they were federatedMark Felder