summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-08search: Apply following filter only when user is usableHaelwenn (lanodan) Monnier
2020-09-08AP C2S: Restrict character limit on NoteHaelwenn (lanodan) Monnier
2020-09-08Fix atom leak in AdminAPIControllerEgor Kislitsyn
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-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-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-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
2020-09-07ForceBotUnlistedPolicy: fix test extensionAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: formatAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: add testAlibek Omarov
2020-09-07ForceBotUnlistedPolicy: initial add, tiny clean up from my previous versionAlibek Omarov
2020-09-07changelog entryAlexander Strizhakov
2020-09-07deprecation warningsAlexander Strizhakov
2020-09-07passing adapter options directly without adapter keyAlexander Strizhakov
2020-09-07migrations for renaming gun timeout optionsAlexander Strizhakov
2020-09-07adapter options unificationAlexander Strizhakov
not needed options deletion
2020-09-07Merge branch 'feature/1790-oban-overuse' into 'develop'rinpatch
removing StatsWorker from Oban cron jobs See merge request pleroma/pleroma!2963
2020-09-07CHANGELOG.md: move Unreleased section ahead of unreleased-patchrinpatch
2020-09-07removing Stats worker from Oban cron jobsAlexander Strizhakov
2020-09-07Merge branch 'temp-hackney-fix' into 'develop'rinpatch
temp hackney fix See merge request pleroma/pleroma!2951
2020-09-07Merge branch 'chore/back-to-upstream-tesla' into 'develop'rinpatch
switch back to upstream tesla See merge request pleroma/pleroma!2966
2020-09-07switch back to upstream teslarinpatch
The patch we required got merged upstream: https://github.com/teamon/tesla/commit/9f7261ca49f9f901ceb73b60219ad6f8a9f6aa30
2020-09-07Add a changelog entry for hackney downgraderinpatch
2020-09-07Merge 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-07Merge 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-07Merge branch 'fix/no-rich-media-error' into 'develop'Haelwenn
RichMedia: do not log webpages missing metadata as errors See merge request pleroma/pleroma!2960
2020-09-07Merge branch 'chore/add-cc-by-4' into 'develop'Haelwenn
Add a copy of CC-BY-4.0 to the repo See merge request pleroma/pleroma!2962
2020-09-07instance: Log catch favicon errors as warningsHaelwenn (lanodan) Monnier
2020-09-06Add a copy of CC-BY-4.0 to the reporinpatch
We mentined it in COPYING, but didn't actually have a copy in the repo.