Commit Graph

11773 Commits

Author SHA1 Message Date
Alibek Omarov
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
4b76d7ce67 Merge branch 'fix/admin-controller-atom-leak' into 'develop'
Fix atom leak in AdminAPIController

See merge request pleroma/secteam/pleroma!6
2020-09-08 14:00:00 +03:00
lain
9b85592b8b 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-08 13:56:42 +03:00
lain
4306050da9 Merge branch 'develop' into 'develop'
Added cmake

See merge request pleroma/pleroma!2953
2020-09-08 13:56:29 +03:00
rinpatch
59f5e39f9b Merge branch 'chore/fast_html-bump' into 'develop'
mix.lock: Bump fast_html

See merge request pleroma/pleroma!2950
2020-09-08 13:56:09 +03:00
rinpatch
964bc8e2e8 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-08 13:55:52 +03:00
feld
43b07c31cb Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
Disallow password resets for deactivated accounts

Closes #2095

See merge request pleroma/pleroma!2935
2020-09-08 13:53:47 +03:00
rinpatch
515116e2f0 Merge branch 'chore/fast-sanitize-bump' into 'develop'
mix.lock: bump fast_sanitize

See merge request pleroma/pleroma!2932
2020-09-08 13:53:32 +03:00
rinpatch
dccbed856d Merge branch 'http-fixes' into 'develop'
Improvements and fixes for http requests

See merge request pleroma/pleroma!2904
2020-09-08 13:53:16 +03:00
rinpatch
ea4b6c64d6 Merge branch 'feat/rich-media-improvements' into 'develop'
Rich media improvements

See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
rinpatch
8c3241df44 Merge branch 'fix/2047-rich-media-parser' into 'develop'
RichMedia parser fix

Closes #2047

See merge request pleroma/pleroma!2941
2020-09-08 13:00:15 +03:00
rinpatch
13e606941c Merge branch 'fix/2087-metadata' into 'develop'
Fix/2087 metadata

See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
rinpatch
74d46a1b09 Merge branch 'secfix/search-crash' into 'develop'
Fix crash done via search

See merge request pleroma/secteam/pleroma!12
2020-09-08 12:53:11 +03:00
rinpatch
84acfab156 Merge branch 'fix-searching-following' into 'develop'
search: fix 'following' query parameter

See merge request pleroma/pleroma!2943
2020-09-08 12:53:02 +03:00
rinpatch
718c7cc847 Merge branch 'fix/apc2s-limits' into 'develop'
AP C2S: Restrict character limit on Note

Closes #2

See merge request pleroma/secteam/pleroma!9
2020-09-08 12:51:38 +03: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
Alibek Omarov
95688c90ad ForceBotUnlistedPolicy: simplify code 2020-09-08 01:15:15 +02:00
Alibek Omarov
d074e54013 ForceBotUnlistedPolicy: try to fix test 2 2020-09-07 23:28:29 +02:00
Alibek Omarov
0a25c92cfa ForceBotUnlistedPolicy: try to fix test 2020-09-07 23:18:36 +02:00
Alibek Omarov
d2fd1d3481 ForceBotUnlistedPolicy: fix test extension 2020-09-07 23:04:07 +02:00
Alibek Omarov
8b695c3eeb ForceBotUnlistedPolicy: format 2020-09-07 22:53:45 +02:00
Alibek Omarov
57cf0cc3b3 ForceBotUnlistedPolicy: add test 2020-09-07 22:50:57 +02:00
Alibek Omarov
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
Mark Felder
563718cab9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy 2020-09-06 08:15:34 -05:00
Ivan Tashkinov
759f8bc3ae [#2497] Fixed MediaProxyWarmingPolicyTest. 2020-09-06 15:30:11 +03: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