aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-07-31Add missing copyrightsfrontends/logic-flowRoman Chvanikov
2020-07-31Merge branch 'develop' into frontends/logic-flowRoman Chvanikov
2020-07-30Merge branch 'render-preview-cards-in-chats' into 'develop'Haelwenn
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
2020-07-30Merge branch 'develop' into frontends/logic-flowRoman Chvanikov
2020-07-30Add Kenoma and Headless frontend controllersRoman Chvanikov
2020-07-30Fix namingRoman Chvanikov
2020-07-30Migrate Redirect controllerRoman Chvanikov
2020-07-30ChatMessage schema: Add preview cards.lain
2020-07-30ChatMessageReferenceView: Display preview cards.lain
2020-07-30Add frontends plug and controller flowRoman Chvanikov
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confir...lain
2020-07-29Merge branch '1996-dont-break-on-chatmessages' into 'develop'Haelwenn
2020-07-29Merge branch 'bugfix/remote-user-atom' into 'develop'lain
2020-07-29feed/user_controller: Return 404 when the user is remoteHaelwenn (lanodan) Monnier
2020-07-29Merge branch 'by-approval' into 'develop'lain
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
2020-07-29EnsureRePrepended: Don't break on chat messages.lain
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