aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-07-23Merge branch 'issue/1878' into 'develop'lain
[#1878] fix reset confirmation email in admin section See merge request pleroma/pleroma!2751
2020-07-23Merge branch 'linkify' into 'develop'lain
Fix Linkify See merge request pleroma/pleroma!2792
2020-07-23added warning to use old keysMaksim Pechnikov
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish ↵Ivan Tashkinov
:restrict_unauthenticated. Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'lain
Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777
2020-07-22added check user email for welcome emailMaksim Pechnikov
2020-07-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
2020-07-22fix sender for welcome emailMaksim Pechnikov
2020-07-21Skip the correct plugMark Felder
2020-07-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
This reverts merge request !2784
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
This reverts merge request !2677
2020-07-21Merge branch 'develop' into fix/pleroma-api-emoji-packsMark Felder
2020-07-21Merge branch 'linkify' into 'develop'lain
AutoLinker --> Linkify, update to latest version See merge request pleroma/pleroma!2677
2020-07-21Merge branch 'gopher-fix' into 'develop'lain
Gopher: using atom keys in search params See merge request pleroma/pleroma!2775
2020-07-21Allow unblocking a domain via query paramsEgor Kislitsyn
2020-07-21added welcome emailMaksim Pechnikov
2020-07-20Pleroma.Formatter can have partial updatesAlex Gleason
2020-07-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs
2020-07-18Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is usedhref
2020-07-18Fix /api/pleroma/emoji/packs index endpoint.KokaKiwi
2020-07-17Merge branch 'fix-1958' into 'develop'Haelwenn
OpenAPI: Add :id to follower/following endpoints, fixes #1958 Closes #1958 See merge request pleroma/pleroma!2772
2020-07-17OpenAPI: Add :id to follower/following endpoints, fixes #1958Alex Gleason
2020-07-17Fully delete users with status :approval_pendingAlex Gleason
2020-07-17Expose the post formats in /api/v1/instanceMark Felder
2020-07-17using atom keys in search paramsAlexander Strizhakov
2020-07-17TOTP length is configurable, so we can't hardcode this here.Mark Felder
2020-07-16Sanitize `reason` param in POST /api/v1/accountsAlex Gleason
2020-07-16Merge remote-tracking branch 'upstream/develop' into linkifyAlex Gleason
2020-07-16Improve TOTP token and recovery input fields in OAuth loginMark Felder
2020-07-15Use `approval_required` in /api/v1/instanceAlex Gleason
2020-07-15Merge branch 'develop' into refactor/gun-pool-registryMark Felder
2020-07-15Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-07-15Merge branch 'features/mrf-reasons' into 'develop'rinpatch
Add rejection reason to our MRFs See merge request pleroma/pleroma!2759
2020-07-15MastoAPI: fix & test giving MRF reject reasonsHaelwenn (lanodan) Monnier
2020-07-15ConnectionPool.Worker: do not stop with an error when there is a timeoutrinpatch
This produced error log messages about GenServer termination every time the connection was not open due to a timeout. Instead we stop with `{:shutdown, <gun_error>}` since shutting down when the connection can't be established is normal behavior.
2020-07-15Set a default timeout for Gun adapter timeouthref
2020-07-15host is now uselesshref
2020-07-15Simplify TLS optshref
- `verify_fun` is not useful now - use `customize_check_hostname` (OTP 20+ so OK) - `partial_chain` is useless as of OTP 21.1 (wasn't there, but hackney/.. uses it)
2020-07-15parentheses...href
2020-07-15Fix race in enforcer/reclaimer starthref
2020-07-15Ensure connections error get known by the callerhref
2020-07-15ConnectionPool.Worker: Open gun conn in continue instead of inithref
2020-07-15Connection Pool: fix LRFU implementation to not actually be LRUrinpatch
The numbers of the native time unit were so small the CRF was always 1, making it an LRU. This commit switches the time to miliseconds and changes the time delta multiplier to the one yielding mostly highest hit rates according to the paper
2020-07-15Request limiter setup: consider {:error, :existing} a successrinpatch
When the application restarts (which happens after certain config changes), the limiters are not destroyed, so `ConcurrentLimiter.new` will produce {:error, :existing}
2020-07-15FollowRedirects: Unconditionally release the connection if there is an errorrinpatch
There is no need for streaming the body if there is no body
2020-07-15Gun adapter helper: fix wildcard cert issues on OTP 23rinpatch
See https://bugs.erlang.org/browse/ERL-1260 for more info. The ssl match function is basically copied from mint, except that `:string.lowercase/1` was replaced by `:string.casefold`. It was a TODO in mint's code, so might as well do it since we don't need to support OTP <20. Closes #1834
2020-07-15Add documentation for new connection pool settings and remove somerinpatch
`:retry_timeout` and `:retry` got removed because reconnecting on failure is something the new pool intentionally doesn't do. `:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because the settings are very different in their behaviour. `:checkin_timeout` got removed in favor of `:connection_acquisition_wait`, I didn't reuse the key because the settings are somewhat different. I didn't do any migrations/deprecation warnings/changelog entries because these settings were never in stable.
2020-07-15Use erlang monotonic time for CRF calculationrinpatch
2020-07-15Adapter Helper: Use built-in ip address typerinpatch
2020-07-15HTTP: Implement max request limitsrinpatch