aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-07-29Merge branch 'by-approval' into 'develop'lain
2020-07-29Endpoint: Serve a dynamically configured admin interfacelain
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
2020-07-29EnsureRePrepended: Don't break on chat messages.lain
2020-07-28SimpleMRF silence: optimize, work okay with nil values in addressingAlex Gleason
2020-07-28SimpleMRF: Let instances be silencedAlex Gleason
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-28FrontendStatic: Add plug to serve frontends based on configuration.lain
2020-07-28Merge branch 'cleanup/masto_fe-default_settings' into 'develop'lain
2020-07-27Fix User.registration_reason HTML sanitizing issuesAlex Gleason
2020-07-27Merge branch 'develop' into 'cleanup/masto_fe-default_settings'lain
2020-07-27masto_fe_view: Remove @default_settingsHaelwenn (lanodan) Monnier
2020-07-27Pipeline: Unify embedded_object / object_data, move to validator.lain
2020-07-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-ob...lain
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-26OpenAPI: remove accidentally pasted buffer dataAlibek Omarov
2020-07-26OpenAPI: Replace actor_id by account_id to follow ChatMessage schemaAlibek Omarov
2020-07-24Side Effects: On undoing, put information about the undone object.Lain Soykaf
2020-07-24Pipeline: Add embedded object federation.Lain Soykaf
2020-07-23Merge branch 'unblock-domain-via-query' into 'develop'feld
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
2020-07-23Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'lain
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
2020-07-23Merge branch 'issue/1878' into 'develop'lain
2020-07-23Merge branch 'linkify' into 'develop'lain
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :re...Ivan Tashkinov
2020-07-22Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'lain
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
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
2020-07-21Merge branch 'develop' into fix/pleroma-api-emoji-packsMark Felder
2020-07-21Merge branch 'linkify' into 'develop'lain
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
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
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 sync...Haelwenn (lanodan) Monnier