summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-08-02Add email blacklist, fixes #1404Alex Gleason
2020-08-01Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'lain
[#1985] Prevented force login on registration if account approval and/or email confirmation needed Closes #1985 See merge request pleroma/pleroma!2823
2020-08-01ConnectionPool: fix gun open errors being returned without an error tuplerinpatch
When gun shuts down due to the host being unreachable, the worker process shuts down with the same shutdown reason since they are linked. Gun doesn't have error tuples in it's shutdown reason though, so we need to handle it in get_conn. Closes #2008
2020-08-01Don't override user-agent header if it's been setRoman Chvanikov
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-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-30Merge branch 'hide-reactions' into 'develop'lain
Let favourites and emoji reactions optionally be hidden See merge request pleroma/pleroma!2804
2020-07-29Expose seconds_valid in Pleroma Captcha API endpointMark Felder
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'issue/1023' into 'develop'lain
[#1023] added generated `pleroma.env` See merge request pleroma/pleroma!2763
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-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-28gun ConnectionPool: Re-add a missing cast for remove_clientrinpatch
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-28gun ConnectionPool: replace casts with callsrinpatch
The slowdown from this is most likely immesurable, however it eliminates possible false positives when tracking dead clients.
2020-07-28FrontendStatic: Add plug to serve frontends based on configuration.lain
2020-07-28InstanceStatic: Refactor.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-27Lint, fix testAlex Gleason
2020-07-27Add configurable registration_reason limitAlex Gleason
2020-07-27Merge remote-tracking branch 'upstream/develop' into by-approvalAlex 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-27Merge branch 'issue/1934-welcome-email' into 'develop'lain
[#1934] welcome email See merge request pleroma/pleroma!2786
2020-07-27Apply 1 suggestion(s) to 1 file(s)lain
2020-07-27Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'Haelwenn
ReverseProxy: Fix a gun connection leak when there is an error with no body See merge request pleroma/pleroma!2798
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-26ReverseProxy tesla client: remove handling of old_connrinpatch
This is no longer relevant because we use a custom FollowRedirects middleware now
2020-07-26ReverseProxy: Fix a gun connection leak when there is an error with norinpatch
body - Modify `close/1` function to do the same thing it does for hackney, which is - close the client rather than the whole connection - Release the connection when there is no body to chunk
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-24Ensure Oban is available during mix tasks.Mark Felder
Fixes: mix pleroma.user rm username
2020-07-24Fix mix tasks that make HTTP calls by starting the Gun connection poolMark Felder
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-24remove duplicate moduleMaksim Pechnikov
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.25.1) at 2025-10-04 21:18:56 +0000