aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
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-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-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
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-21Allow unblocking a domain via query paramsEgor Kislitsyn
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-17Expose the post formats in /api/v1/instanceMark Felder
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/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-15Create Question: Add context field to createHaelwenn (lanodan) Monnier
2020-07-15{Answer,Question}Validator: Keep both actor and attributedTo for now but ↵Haelwenn (lanodan) Monnier
sync them
2020-07-15Fix attachments in pollsHaelwenn (lanodan) Monnier
2020-07-15Fixup for EctoType module moveHaelwenn (lanodan) Monnier
2020-07-15QuestionValidator: Use AttachmentValidatorHaelwenn (lanodan) Monnier
2020-07-15CreateGenericValidator: add expires_atHaelwenn (lanodan) Monnier
2020-07-15SideEffects: port ones from ActivityPub.do_create and ActivityPub.insertHaelwenn (lanodan) Monnier
2020-07-15question_validator: remove conversation fieldHaelwenn (lanodan) Monnier
2020-07-15question_validator: fix for mastodon poll expirationHaelwenn (lanodan) Monnier
Mastodon activities do not have a "closed" field, this could be seen on https://pouet.it/users/lanodan_tmp/statuses/104345126997708380 which runs Mastodon 3.1.4 (SDF runs 3.1.2)
2020-07-15create_question_validator: remove validate_recipients_matchHaelwenn (lanodan) Monnier
2020-07-15Fix multiple-choice poll detectionHaelwenn (lanodan) Monnier
2020-07-15transmogrifier_test: test date, anyOf and oneOf completelyHaelwenn (lanodan) Monnier
2020-07-15QuestionOptionsValidator: inline schema for repliesHaelwenn (lanodan) Monnier
2020-07-15AnswerValidator: CreateHaelwenn (lanodan) Monnier
2020-07-15QuestionValidator: CreateHaelwenn (lanodan) Monnier
2020-07-14Email admins when a new unapproved account is up for reviewAlex Gleason
2020-07-14Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-14AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpointAlex Gleason
2020-07-14AdminAPI: Filter users by `need_approval`Alex Gleason
2020-07-14AdminAPI: Return `approval_pending` with usersAlex Gleason
2020-07-14Include port in host for signaturesMaksim Pechnikov
2020-07-14AdminAPI: Return `registration_reason` with usersAlex Gleason
2020-07-14Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'feld
Support for hosts with scheme in MediaProxy whitelist setting Closes #1922 See merge request pleroma/pleroma!2754
2020-07-14Merge branch '1940-admin-token-oauthless-auth' into 'develop'feld
[#1940] Reinstated OAuth-less `admin_token` authentication Closes #1940 See merge request pleroma/pleroma!2760