aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-17CHANGELOG.md: Add back an entry for S3 fixrinpatch
2020-11-17Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!3127
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
Updates the frontend bundle and syncs the changelog.
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
Fix S3 uploads with Elixir 1.11 See merge request pleroma/pleroma!3148
2020-11-17Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'lain
Use absolute URLs to thumbnail and background in /api/v1/instance See merge request pleroma/pleroma!3149
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
pleroma.instance: Fix Exiftool module name See merge request pleroma/pleroma!3143
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
'develop' fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912
2020-11-13Make notifs view work for reportsIlja
* These are the first small steps for issue 2034 "Reports should send a notification to admins". * I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later) * I added the new type to the notification_controller * I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13Merge branch 'docs/otp-tuning' into 'develop'lain
First draft of tips for optimizing BEAM See merge request pleroma/pleroma!3123
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
remove PurgeExpiredActivity from Oban db config See merge request pleroma/pleroma!3137
2020-11-13remove PurgeExpiredActivity from Oban db configAlexander Strizhakov
2020-11-12Merge branch 'majic-dep' into 'develop'feld
Install file-dev in Dockerfile build stage See merge request pleroma/pleroma!3135
2020-11-12Install file-dev in Dockerfile build stageMichael Walker
This is required by the majic, added in #2534.
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'v2.2.0rinpatch
Release/2.2.0 See merge request pleroma/secteam/pleroma!19
2020-11-12Fix object spoofing vulnerability in attachmentsrinpatch
Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948
2020-11-12Merge branch 'title-injection-change' into 'develop'Haelwenn
Title injection change See merge request pleroma/pleroma!3132
2020-11-11Merge branch 'feature/ingest-blurhash' into 'develop'feld
Ingest blurhash for attachments if they were federated Closes #2294 See merge request pleroma/pleroma!3133
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
2020-11-11Fix markdownEgor Kislitsyn
2020-11-11Change endpoint pathEgor Kislitsyn
2020-11-11Changelog: Add info about title injectionlain
2020-11-11Bundled FE: Remove title taglain
2020-11-11Merge branch 'mrf-config-descriptions' into 'develop'feld
little changes for MRF config descriptions See merge request pleroma/pleroma!3131
2020-11-11Remove FrontendInstallerWorkerEgor Kislitsyn
2020-11-11RedirectController: Don't replace title, but inject into the metalain
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 14:39:27 +0000