aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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.
2020-09-05RichMedia: do not log webpages missing metadata as errorsrinpatch
Also fixes the return value of Parser.parse on errors, previously was just `:ok` due to the logger call in the end
2020-09-05Merge branch 'hotfix-the-hotfix' into 'develop'rinpatch
ConnectionPool: fix the previous hotfix See merge request pleroma/pleroma!2959
2020-09-05ConnectionPool middleware: handle connection opening errorsrinpatch
2020-09-05ConnectionPool: fix the previous hotfixrinpatch
I rushed the hotfix and forgot how `pop_in` actually works, I want to die. We need some integration tests for the HTTP client
2020-09-05Merge branch 'hotfix/tesla-env-no-access' into 'develop'rinpatch
ConnectionPool middleware: fix a crash due to unimplemented behaviour See merge request pleroma/pleroma!2958
2020-09-05ConnectionPool middleware: fix a crash due to unimplemented behaviourrinpatch
Structs don't implement Access behaviour, so this crashed. Tests didn't catch it and I didn't test that part of the codepath. Very sorry
2020-09-05Rich Media: Do not cache URLs for preview statusesrinpatch
Closes #1987
2020-09-05Merge branch 'fix/pool-middleware-reverseproxy-leak' into 'develop'rinpatch
ConnectionPool middleware: Fix connection leak on ReverseProxy redirects See merge request pleroma/pleroma!2954
2020-09-05use override flag for hackney dependencyAlexander Strizhakov
2020-09-05Prevent AccountView and instance.get_or_update_favicon failsHaelwenn (lanodan) Monnier
2020-09-05Merge branch 'use-https-in-dockerfile' into 'develop'Haelwenn
Use TLS when adding Alpine community repository in Dockerfile See merge request pleroma/pleroma!2955
2020-09-04Use TLS when adding Alpine community repository in DockerfileJames Alseth