aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-08Fix atom leak in AdminAPIControllerEgor Kislitsyn
2020-09-08Merge branch 'release/2.1.1' into 'stable'v2.1.1rinpatch
2.1.1 release See merge request pleroma/secteam/pleroma!13
2020-09-08SECURITY.md: we don't support 2.0 anymore, bump to 2.1rinpatch
2020-09-08Merge branch 'bugfix/mock' into 'develop'Haelwenn
mockfix but for non-secteam because gitlab See merge request pleroma/pleroma!2973
2020-09-08pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679rinpatch
2020-09-08Merge branch 'temp-hackney-fix' into 'develop'rinpatch
temp hackney fix See merge request pleroma/pleroma!2951
2020-09-08Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'rinpatch
Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924
2020-09-08CHANGELOG.md: Add 2.1.1 entryrinpatch
2020-09-08Remove OStatus in testsuiteHaelwenn (lanodan) Monnier
2020-09-08Drop unused "inReplyToAtomUri" in objectsHaelwenn (lanodan) Monnier
2020-09-08Merge branch 'bugfix/mock' into 'develop'Haelwenn
mockfix but for non-secteam because gitlab See merge request pleroma/pleroma!2973
2020-09-08combo fixesAlexander Strizhakov
2020-09-08don't run async tests, which use MockAlexander Strizhakov
2020-09-08Merge branch 'develop' into 'develop'feld
ForceBotUnlistedPolicy See merge request pleroma/pleroma!2967
2020-09-08Merge branch 'bugfix/favicon-empty-test' into 'develop'Haelwenn
Bugfix/favicon empty test See merge request pleroma/pleroma!2972
2020-09-08account_view_test: Remove empty testHaelwenn (lanodan) Monnier
2020-09-08test: remove extraneous :instances_favicons config bitsHaelwenn (lanodan) Monnier
2020-09-08Revert "description.exs: add ForceBotUnlistedPolicy"Mark Felder
This reverts commit 7215563641e2a5096293128519d6a454aabc46f2.
2020-09-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlistedMark Felder
2020-09-08Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'rinpatch
Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924
2020-09-08mix.exs: bump version to 2.1.1rinpatch
2020-09-08Disable favicon scraping in testsrinpatch
2020-09-08changelog: add ForceBotUnlistedPolicyAlibek Omarov
2020-09-08docs: cheatsheet: add ForceBotUnlistedPolicyAlibek Omarov
2020-09-08description.exs: add ForceBotUnlistedPolicyAlibek Omarov
2020-09-08Merge branch 'fix/2108-adapter-options' into 'develop'rinpatch
Adapter options unification Closes #2108 See merge request pleroma/pleroma!2952
2020-09-08Merge branch 'fix/admin-controller-atom-leak' into 'develop'rinpatch
Fix atom leak in AdminAPIController See merge request pleroma/secteam/pleroma!6
2020-09-08Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956
2020-09-08Merge branch 'develop' into 'develop'lain
Added cmake See merge request pleroma/pleroma!2953
2020-09-08Merge branch 'chore/fast_html-bump' into 'develop'rinpatch
mix.lock: Bump fast_html See merge request pleroma/pleroma!2950
2020-09-08Merge branch 'bugfix/favicon-too-long' into 'develop'rinpatch
instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-08Merge branch 'chore/fast-sanitize-bump' into 'develop'rinpatch
mix.lock: bump fast_sanitize See merge request pleroma/pleroma!2932
2020-09-08Merge branch 'http-fixes' into 'develop'rinpatch
Improvements and fixes for http requests See merge request pleroma/pleroma!2904
2020-09-08Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
Rich media improvements See merge request pleroma/pleroma!2944
2020-09-08Merge branch 'fix/2047-rich-media-parser' into 'develop'rinpatch
RichMedia parser fix Closes #2047 See merge request pleroma/pleroma!2941
2020-09-08Merge branch 'fix/2087-metadata' into 'develop'rinpatch
Fix/2087 metadata See merge request pleroma/secteam/pleroma!11
2020-09-08Merge branch 'secfix/search-crash' into 'develop'rinpatch
Fix crash done via search See merge request pleroma/secteam/pleroma!12
2020-09-08Merge branch 'fix-searching-following' into 'develop'rinpatch
search: fix 'following' query parameter See merge request pleroma/pleroma!2943
2020-09-08Merge branch 'fix/apc2s-limits' into 'develop'rinpatch
AP C2S: Restrict character limit on Note Closes #2 See merge request pleroma/secteam/pleroma!9
2020-09-08CHANGELOG.md: move the exiftool webp entry to a proper sectionrinpatch
Also clarify how it was fixed
2020-09-08Revert/simplify.Mark Felder
We only need to check the content-type. There's no chance a webp file will get mismatched as another image type.
2020-09-08Bypass the filter based on content-type as well in case a webp image is ↵Mark Felder
uploaded with the wrong file extension.
2020-09-08Verify webp files are not processed with exiftoolMark Felder
2020-09-08Improve upload filter return values so we can identify when filters make no ↵Mark Felder
changes to the input
2020-09-08Fix uploading webp image files when Exiftool Upload Filter is enabledMark Felder
2020-09-08CHANGELOG.md: Split settings renaming to 2 separate entriesrinpatch
2020-09-08ForceBotUnlistedPolicy: simplify codeAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: try to fix test 2Alibek Omarov
2020-09-07ForceBotUnlistedPolicy: try to fix testAlibek Omarov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:13:01 +0000