aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2020-08-04Merge branch 'chore/consolidate-rich-media-http' into 'develop'rinpatch
Consolidate construction of Rich Media Parser HTTP requests See merge request pleroma/pleroma!2827
2020-08-04Fix ActivityExpirationPolicyEgor Kislitsyn
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/poll-validation
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
2020-08-04question_validator: Allow content to be an empty-string (blank)Haelwenn (lanodan) Monnier
2020-08-04CommonValidations: Treat deactivated users as not present.lain
2020-08-03Consolidate construction of Rich Media Parser HTTP requestsMark Felder
2020-08-03Merge branch 'follower-mrf-again' into 'develop'lain
Follower mrf again See merge request pleroma/pleroma!2833
2020-08-03Merge branch 'object-age-fix' into 'develop'lain
MRF Object Age Policy: Don't break on messages without cc/to See merge request pleroma/pleroma!2840
2020-08-03MRF Object Age Policy: Don't break on messages without cc/tolain
2020-07-31Revert "Merge branch 'revert-1ac0969c' into 'develop'"lain
This reverts merge request !2825
2020-07-31Revert "Merge branch 'mrf-silence-2' into 'develop'"lain
This reverts merge request !2820
2020-07-31Merge branch 'mrf-silence-2' into 'develop'lain
MRF silencing alternative solution See merge request pleroma/pleroma!2820
2020-07-31Merge remote-tracking branch 'pleroma/develop' into features/poll-validationHaelwenn (lanodan) Monnier
2020-07-31[#1985] Prevented force login on registration if account approval and/or ↵Ivan Tashkinov
email confirmation needed. Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31SimplePolicy: Fix problem with DM leaks.lain
2020-07-30Merge branch 'render-preview-cards-in-chats' into 'develop'Haelwenn
Render preview cards in chats See merge request pleroma/pleroma!2816
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809
2020-07-30ChatMessage schema: Add preview cards.lain
2020-07-30ChatMessageReferenceView: Display preview cards.lain
2020-07-29Merge remote-tracking branch 'upstream/develop' into mrf-silenceAlex Gleason
2020-07-29SimpleMRF: :silence --> :followers_onlyAlex Gleason
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-admin
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1993-confirm-users-on-registration
2020-07-29Merge branch '1996-dont-break-on-chatmessages' into 'develop'Haelwenn
EnsureRePrepended: Don't break on chat messages. Closes #1996 See merge request pleroma/pleroma!2808
2020-07-29Merge branch 'bugfix/remote-user-atom' into 'develop'lain
feed/user_controller: Return 404 when the user is remote Closes #1911 See merge request pleroma/pleroma!2811
2020-07-29feed/user_controller: Return 404 when the user is remoteHaelwenn (lanodan) Monnier
2020-07-29Merge branch 'by-approval' into 'develop'lain
Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757
2020-07-29Endpoint: Serve a dynamically configured admin interfacelain
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
Confirmation is set in User.register_changeset based on the config settings.
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
masto_fe_view: Remove @default_settings See merge request pleroma/pleroma!2799
2020-07-27Fix User.registration_reason HTML sanitizing issuesAlex Gleason
2020-07-27Merge branch 'develop' into 'cleanup/masto_fe-default_settings'lain
# Conflicts: # lib/pleroma/web/views/masto_fe_view.ex
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 ↵lain
embedded-object-federation
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
Allow unblocking a domain via query params Closes #1971 See merge request pleroma/pleroma!2783
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 22:22:11 +0000