aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-07added api specMaksim Pechnikov
2020-09-06added import mutesMaksim Pechnikov
2020-09-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Mark Felder
media-preview-proxy
2020-09-06[#2497] Fixed MediaProxyWarmingPolicyTest.Ivan Tashkinov
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-05[#2497] Func defs grouping fix.Ivan Tashkinov
2020-09-05[#2497] Adjusted media proxy preview invalidation. Allowed client-side ↵Ivan Tashkinov
caching for media preview. Adjusted prewarmer to fetch only proxiable URIs. Removed :preview pool in favor of existing :media one. Misc. refactoring.
2020-09-05[#2497] Made media preview proxy fall back to media proxy instead of to ↵Ivan Tashkinov
source url. Adjusted tests. Refactoring.
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
2020-09-04ConnectionPool middleware: Fix connection leak on ReverseProxy redirectsrinpatch
Requires a patched Tesla due to upstream not saving opts between redirects, patch submitted at https://github.com/teamon/tesla/pull/414
2020-09-04Merge branch 'develop' into 'develop'lain
Added cmake See merge request pleroma/pleroma!2953
2020-09-04Added cmakeFarhan Khan
2020-09-04fix for ReverseProxyAlexander Strizhakov
2020-09-04temp hackney fixAlexander Strizhakov
2020-09-04Merge branch 'feat/simplify-pool-managment' into 'develop'Haelwenn
HTTP: radically simplify pool checkin/checkout See merge request pleroma/pleroma!2948
2020-09-04Merge branch 'chore/fast_html-bump' into 'develop'rinpatch
mix.lock: Bump fast_html See merge request pleroma/pleroma!2950
2020-09-04mix.lock: Bump fast_htmlHaelwenn (lanodan) Monnier
This update fixes an incorrect push to Hex that reverted the gcc-10 fix
2020-09-03HTTP: radically simplify pool checkin/checkoutrinpatch
Use a custom tesla middleware instead of adapter helper function + custom redirect middleware. This will also fix "Client died before releasing the connection" messages when the request pool is overloaded. Since the checkout is now done after passing ConcurrentLimiter. This is technically less efficient, since the connection needs to be checked in/out every time the middleware is left or entered respectively. But I don't think the nanoseconds we might lose on redirects to the same host are worth the complexity.
2020-09-03URL passed to helper is already MediaProxyMark Felder
Set :preview pool on the request
2020-09-03Increase pool and timeout for preview so it catches slow media pool responsesMark Felder
2020-09-03Merge branch 'media-preview-proxy' of git.pleroma.social:pleroma/pleroma ↵Mark Felder
into feld-media-preview-proxy
2020-09-03Fetch preview requests through the MediaProxy. Separate connection options ↵Mark Felder
are not needed. Use a separate pool for preview requests
2020-09-03[#2497] Added support for enforcing output format for media proxy preview, ↵Ivan Tashkinov
used for avatar_static & header_static (AccountView).
2020-09-03Merge branch 'develop' into media-preview-proxyMark Felder
2020-09-03Merge branch 'bugfix/incoming-poll-emoji' into 'develop'lain
Fix emoji in Question, force generated context/context_id insertion Closes #1870 See merge request pleroma/pleroma!2915
2020-09-03Merge branch 'fix_install_fe_bug' into 'develop'lain
Fix frontend install mix task bug See merge request pleroma/pleroma!2942
2020-09-03Frontend mix task: Add tests.lain
2020-09-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
seanking/pleroma-fix_install_fe_bug
2020-09-02Merge 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-02Merge branch 'fix/1991-tzdata-update' into 'develop'lain
user agent if Endpoint is not started yet Closes #1991 See merge request pleroma/pleroma!2945
2020-09-02Merge branch 'bugfix/mastoapi-lists' into 'develop'lain
Fix removing an account from a list Closes #2103 See merge request pleroma/pleroma!2940
2020-09-02ListController: DRY up stuff.lain
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
Ensure all responses to password reset events are identical.
2020-09-02Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
Rich media improvements See merge request pleroma/pleroma!2944