rinpatch
|
acf6393c87
|
SECURITY.md: we don't support 2.0 anymore, bump to 2.1
|
2020-09-08 20:13:00 +03:00 |
|
Haelwenn
|
09416d8a03
|
Merge branch 'bugfix/mock' into 'develop'
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
|
2020-09-08 16:42:27 +00:00 |
|
Alexander Strizhakov
|
87d2805791
|
combo fixes
|
2020-09-08 17:40:23 +02:00 |
|
Alexander Strizhakov
|
fd7e9bdd25
|
don't run async tests, which use Mock
|
2020-09-08 17:40:23 +02:00 |
|
|
|
bf048ab72f
|
Merge branch 'develop' into 'develop'
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
|
2020-09-08 14:52:51 +00:00 |
|
Haelwenn
|
9e49f4627f
|
Merge branch 'bugfix/favicon-empty-test' into 'develop'
Bugfix/favicon empty test
See merge request pleroma/pleroma!2972
|
2020-09-08 14:52:33 +00:00 |
|
Haelwenn (lanodan) Monnier
|
f6723dc9bd
|
account_view_test: Remove empty test
|
2020-09-08 16:33:22 +02:00 |
|
Haelwenn (lanodan) Monnier
|
788dececff
|
test: remove extraneous :instances_favicons config bits
|
2020-09-08 16:32:54 +02:00 |
|
Mark Felder
|
bb0d7b7aaa
|
Revert "description.exs: add ForceBotUnlistedPolicy"
This reverts commit 7215563641.
|
2020-09-08 09:31:47 -05:00 |
|
Mark Felder
|
21efda2edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
|
2020-09-08 09:31:26 -05:00 |
|
rinpatch
|
0a05670b44
|
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
|
2020-09-08 12:21:33 +00:00 |
|
|
|
5d814f739c
|
changelog: add ForceBotUnlistedPolicy
|
2020-09-08 11:35:34 +00:00 |
|
|
|
efff2caccc
|
docs: cheatsheet: add ForceBotUnlistedPolicy
|
2020-09-08 11:34:04 +00:00 |
|
|
|
7215563641
|
description.exs: add ForceBotUnlistedPolicy
|
2020-09-08 11:32:46 +00:00 |
|
rinpatch
|
d34dc4a746
|
Merge branch 'fix/2108-adapter-options' into 'develop'
Adapter options unification
Closes #2108
See merge request pleroma/pleroma!2952
|
2020-09-08 11:20:31 +00:00 |
|
rinpatch
|
0f27211dd0
|
CHANGELOG.md: move the exiftool webp entry to a proper section
Also clarify how it was fixed
|
2020-09-08 12:30:01 +03:00 |
|
Mark Felder
|
4ea07f74e9
|
Revert/simplify.
We only need to check the content-type. There's no chance a webp file
will get mismatched as another image type.
|
2020-09-08 12:29:38 +03:00 |
|
Mark Felder
|
216c84a8f4
|
Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.
|
2020-09-08 12:29:38 +03:00 |
|
Mark Felder
|
3a98960c26
|
Verify webp files are not processed with exiftool
|
2020-09-08 12:29:38 +03:00 |
|
Mark Felder
|
2165a24974
|
Improve upload filter return values so we can identify when filters make no changes to the input
|
2020-09-08 12:29:38 +03:00 |
|
Mark Felder
|
fa347b9c2f
|
Fix uploading webp image files when Exiftool Upload Filter is enabled
|
2020-09-08 12:29:38 +03:00 |
|
rinpatch
|
d8a48f8386
|
CHANGELOG.md: Split settings renaming to 2 separate entries
|
2020-09-08 12:23:08 +03:00 |
|
|
|
95688c90ad
|
ForceBotUnlistedPolicy: simplify code
|
2020-09-08 01:15:15 +02:00 |
|
|
|
d074e54013
|
ForceBotUnlistedPolicy: try to fix test 2
|
2020-09-07 23:28:29 +02:00 |
|
|
|
0a25c92cfa
|
ForceBotUnlistedPolicy: try to fix test
|
2020-09-07 23:18:36 +02:00 |
|
|
|
d2fd1d3481
|
ForceBotUnlistedPolicy: fix test extension
|
2020-09-07 23:04:07 +02:00 |
|
|
|
8b695c3eeb
|
ForceBotUnlistedPolicy: format
|
2020-09-07 22:53:45 +02:00 |
|
|
|
57cf0cc3b3
|
ForceBotUnlistedPolicy: add test
|
2020-09-07 22:50:57 +02:00 |
|
|
|
699224a900
|
ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version
|
2020-09-07 22:15:42 +02:00 |
|
Alexander Strizhakov
|
7ad1732ed2
|
changelog entry
|
2020-09-07 20:00:47 +03:00 |
|
Alexander Strizhakov
|
18d21aed00
|
deprecation warnings
|
2020-09-07 19:59:17 +03:00 |
|
Alexander Strizhakov
|
696bf09433
|
passing adapter options directly without adapter key
|
2020-09-07 19:59:17 +03:00 |
|
Alexander Strizhakov
|
8a3d43044a
|
migrations for renaming gun timeout options
|
2020-09-07 19:59:17 +03:00 |
|
Alexander Strizhakov
|
a83916fdac
|
adapter options unification
not needed options deletion
|
2020-09-07 19:59:17 +03:00 |
|
rinpatch
|
c5434dbefc
|
Merge branch 'feature/1790-oban-overuse' into 'develop'
removing StatsWorker from Oban cron jobs
See merge request pleroma/pleroma!2963
|
2020-09-07 16:49:27 +00:00 |
|
rinpatch
|
8c6485c470
|
CHANGELOG.md: move Unreleased section ahead of unreleased-patch
|
2020-09-07 19:22:56 +03:00 |
|
Alexander Strizhakov
|
ee67c98e55
|
removing Stats worker from Oban cron jobs
|
2020-09-07 19:16:14 +03:00 |
|
rinpatch
|
6c6de8e5df
|
Merge branch 'temp-hackney-fix' into 'develop'
temp hackney fix
See merge request pleroma/pleroma!2951
|
2020-09-07 12:47:43 +00:00 |
|
rinpatch
|
b5f3694302
|
Merge branch 'chore/back-to-upstream-tesla' into 'develop'
switch back to upstream tesla
See merge request pleroma/pleroma!2966
|
2020-09-07 12:38:22 +00:00 |
|
rinpatch
|
8628e1b216
|
switch back to upstream tesla
The patch we required got merged upstream: 9f7261ca49
|
2020-09-07 15:21:20 +03:00 |
|
rinpatch
|
1984ff3103
|
Add a changelog entry for hackney downgrade
|
2020-09-07 15:16:04 +03:00 |
|
rinpatch
|
d5c286b802
|
Merge branch 'bugfix/favicon-too-long' into 'develop'
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
|
2020-09-07 11:12:30 +00:00 |
|
lain
|
fdab01ab56
|
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
|
2020-09-07 10:19:19 +00:00 |
|
Haelwenn
|
000c315ee7
|
Merge branch 'fix/no-rich-media-error' into 'develop'
RichMedia: do not log webpages missing metadata as errors
See merge request pleroma/pleroma!2960
|
2020-09-07 08:18:59 +00:00 |
|
Haelwenn
|
23932aaf38
|
Merge branch 'chore/add-cc-by-4' into 'develop'
Add a copy of CC-BY-4.0 to the repo
See merge request pleroma/pleroma!2962
|
2020-09-07 08:14:34 +00:00 |
|
Haelwenn (lanodan) Monnier
|
08aef7dd4e
|
instance: Log catch favicon errors as warnings
|
2020-09-07 08:40:52 +02:00 |
|
rinpatch
|
0b4fa769f4
|
Add a copy of CC-BY-4.0 to the repo
We mentined it in COPYING, but didn't actually have a copy in the repo.
|
2020-09-06 11:38:38 +03:00 |
|
rinpatch
|
170599c390
|
RichMedia: do not log webpages missing metadata as errors
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
|
2020-09-05 22:05:35 +03:00 |
|
rinpatch
|
047a60c46e
|
Merge branch 'hotfix-the-hotfix' into 'develop'
ConnectionPool: fix the previous hotfix
See merge request pleroma/pleroma!2959
|
2020-09-05 19:04:19 +00:00 |
|
rinpatch
|
129a2f48df
|
ConnectionPool middleware: handle connection opening errors
|
2020-09-05 21:36:17 +03:00 |
|
