Commit Graph

6514 Commits (70951d042b5d7b12608a3f73a73c757fc4204449)

Author SHA1 Message Date
lain 70951d042b Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'
4 years ago
rinpatch 45be1fe00e ConnectionPool: fix gun open errors being returned without an error tuple
4 years ago
Roman Chvanikov 4bf44b7d65 Don't override user-agent header if it's been set
4 years ago
Ivan Tashkinov 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed.
4 years ago
Haelwenn d1cf1108ac Merge branch 'render-preview-cards-in-chats' into 'develop'
4 years ago
Haelwenn 87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop'
4 years ago
lain a3c37379e9 ChatMessage schema: Add preview cards.
4 years ago
lain 781b270863 ChatMessageReferenceView: Display preview cards.
4 years ago
lain 873ff5ce14 Merge branch 'hide-reactions' into 'develop'
4 years ago
Mark Felder 33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint
4 years ago
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
Haelwenn 269b61a240 Merge branch '1996-dont-break-on-chatmessages' into 'develop'
4 years ago
lain de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 2e27847573
feed/user_controller: Return 404 when the user is remote
4 years ago
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop'
4 years ago
lain c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed.
4 years ago
lain edf8b6abfe EnsureRePrepended: Don't break on chat messages.
4 years ago
rinpatch dab1d8c98e gun ConnectionPool: Re-add a missing cast for remove_client
4 years ago
Alex Gleason 3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
rinpatch 4ce6179dc7 gun ConnectionPool: replace casts with calls
4 years ago
lain ad5c42628a FrontendStatic: Add plug to serve frontends based on configuration.
4 years ago
lain 14c28dcbd1 InstanceStatic: Refactor.
4 years ago
lain e5ac9534aa Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
4 years ago
Alex Gleason f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
Alex Gleason f43518eb74
Lint, fix test
4 years ago
Alex Gleason 6f44a0ee84
Add configurable registration_reason limit
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
lain e1a1c8e7de Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
4 years ago
Haelwenn (lanodan) Monnier 4a6389316d
masto_fe_view: Remove @default_settings
4 years ago
lain 9e6f4694dd Pipeline: Unify embedded_object / object_data, move to validator.
4 years ago
lain 762c9ea564 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
4 years ago
lain 2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop'
4 years ago
lain 0d5d1c62ef Apply 1 suggestion(s) to 1 file(s)
4 years ago
Haelwenn 64b21cee14 Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
rinpatch 6bf8eee5f9 ReverseProxy tesla client: remove handling of old_conn
4 years ago
rinpatch d4fbec62a3 ReverseProxy: Fix a gun connection leak when there is an error with no
4 years ago
Alibek Omarov 6107440ea0 OpenAPI: remove accidentally pasted buffer data
4 years ago
Alibek Omarov b31844d6e0 OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
4 years ago
Lain Soykaf 3d13fb05f8 Side Effects: On undoing, put information about the undone object.
4 years ago
Lain Soykaf 91f3cf9bc6 Pipeline: Add embedded object federation.
4 years ago
Maksim Pechnikov 61ef1fca4b remove duplicate module
4 years ago
feld 51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop'
4 years ago
Mark Felder 4bfad0b483 Support blocking via query parameters as well and document the change.
4 years ago
Haelwenn 6100b90209 Merge branch '1976-status-view-fixes' into 'develop'
4 years ago
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
4 years ago
lain 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
4 years ago
Ivan Tashkinov 9ea51a6de5 [#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
lain b2ba70eec4 Merge branch 'bugfix/mrf-reject-logging' into 'develop'
4 years ago