aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 '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
2020-11-11Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn
2020-11-11little changes for MRF config descriptionsAlexander Strizhakov
- log level reduction, if policy doesn't implement config_description method - docs in dev.md
2020-11-11Fix formattingEgor Kislitsyn
2020-11-11Add `local` visibilityEgor Kislitsyn
2020-11-11Merge branch 'feature/2222-config-descriptions-for-custom-modules' into ↵feld
'develop' Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128
2020-11-11Moving some background jobs into simple tasksAlexander Strizhakov
- fetching activity data - attachment prefetching - using limiter to prevent overload
2020-11-11changes after rebaseAlexander Strizhakov
2020-11-11making credo happy and test fixAlexander Strizhakov
2020-11-11fix for adminFEAlexander Strizhakov
- revert UserAllowPolicy description - MRF descriptions order
2020-11-10Apply 1 suggestion(s) to 1 file(s)feld
2020-11-10Apply 1 suggestion(s) to 1 file(s)feld
2020-11-10Apply 1 suggestion(s) to 1 file(s)feld
2020-11-10Apply 1 suggestion(s) to 1 file(s)feld
2020-11-10config descriptions for custom MRF policiesAlexander Strizhakov
2020-11-10Merge branch '2260-wrong-report-link' into 'develop'lain
Resolve "Wrong user link in Report email" Closes #2260 See merge request pleroma/pleroma!3121
2020-11-10Merge branch 'fix/html-title-load' into 'develop'lain
Fix title on load of Pleroma HTML, fixes #2281 Closes #2281 See merge request pleroma/pleroma!3125
2020-11-10Merge branch 'fix/2291-atom-feed-escape' into 'develop'lain
Escaping in xml templates Closes #2291 See merge request pleroma/pleroma!3126
2020-11-10escaping summary and other fields in xml templatesAlexander Strizhakov
2020-11-09Merge branch 'remove/release-env' into 'develop'Haelwenn
Remove release_env See merge request pleroma/pleroma!3124
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 09:14:10 +0000