aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-07-23Support blocking via query parameters as well and document the change.Mark Felder
2020-07-23Merge branch '1976-status-view-fixes' into 'develop'Haelwenn
StatusView: Handle badly formatted emoji reactions. Closes #1976 See merge request pleroma/pleroma!2788
2020-07-23Merge branch 'develop' into issue/1934-welcome-emailMaksim Pechnikov
2020-07-23Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'lain
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting Closes #1973 See merge request pleroma/pleroma!2791
2020-07-23[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.Ivan Tashkinov
2020-07-23Merge branch 'bugfix/mrf-reject-logging' into 'develop'lain
Fix #783: Make MRF reject log as info level instead of error Closes #783 See merge request pleroma/pleroma!2758
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-22Merge branch 'develop' into issue/1023Maksim 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-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-16Apply 1 suggestion(s) to 1 file(s)Maksim
2020-07-16Apply 1 suggestion(s) to 1 file(s)Maksim
2020-07-16Merge branch 'develop' into issue/1023Maksim Pechnikov
2020-07-16update task messagesMaksim Pechnikov
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