Commit Graph

6587 Commits (a4a2d3864049e03599057ab87ead4aea423c47eb)

Author SHA1 Message Date
Ivan Tashkinov 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed.
4 years ago
lain 1dd162a5f7 SimplePolicy: Fix problem with DM leaks.
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 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only
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
Alex Gleason 2a99e7df8e
SimpleMRF silence: optimize, work okay with nil values in addressing
4 years ago
Alex Gleason 3c90f7f715
SimpleMRF: Let instances be silenced
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
lain 250e0369c7 Merge branch 'issue/1878' into 'develop'
4 years ago
lain a81581472f Merge branch 'linkify' into 'develop'
4 years ago
Maksim Pechnikov 7991ddad58 added warning to use old keys
4 years ago
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
4 years ago
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
4 years ago
Maksim Pechnikov db0224d174 added check user email for welcome email
4 years ago
Lain Soykaf 0cb9e1da74 StatusView: Handle badly formatted emoji reactions.
4 years ago
Maksim Pechnikov 5879d36854 fix sender for welcome email
4 years ago
Mark Felder 341a8f3500 Skip the correct plug
4 years ago
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
4 years ago
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
4 years ago
Mark Felder 97c60b6a43 Merge branch 'develop' into fix/pleroma-api-emoji-packs
4 years ago
lain 2b5d9eb105 Merge branch 'linkify' into 'develop'
4 years ago
lain fa2421dd7e Merge branch 'gopher-fix' into 'develop'
4 years ago
Egor Kislitsyn bdb3375933
Allow unblocking a domain via query params
4 years ago
Maksim Pechnikov 3edaecae96 added welcome email
4 years ago
Alex Gleason 204dddcfaa
Pleroma.Formatter can have partial updates
4 years ago
href 4bac25e6f5 Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
4 years ago
KokaKiwi 7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
4 years ago
Haelwenn 10d46235cf Merge branch 'fix-1958' into 'develop'
4 years ago
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Alex Gleason 5756843736
Fully delete users with status :approval_pending
4 years ago
Mark Felder 20a496d2cb Expose the post formats in /api/v1/instance
4 years ago
Alexander Strizhakov af376cbffb
using atom keys in search params
4 years ago
Mark Felder 62438530e2 TOTP length is configurable, so we can't hardcode this here.
4 years ago
Alex Gleason 5e74556703
Sanitize `reason` param in POST /api/v1/accounts
4 years ago
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder 3be64556db Improve TOTP token and recovery input fields in OAuth login
4 years ago
Alex Gleason 9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry
4 years ago
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings
4 years ago
rinpatch 0fe36b311c Merge branch 'features/mrf-reasons' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
rinpatch 7115c5f82e ConnectionPool.Worker: do not stop with an error when there is a timeout
4 years ago
href 6d583bcc3b Set a default timeout for Gun adapter timeout
4 years ago
href afd378f84c host is now useless
4 years ago
href ce1a42bd04 Simplify TLS opts
4 years ago
href 53ba6815b1 parentheses...
4 years ago
href 23d714ed30 Fix race in enforcer/reclaimer start
4 years ago
href 6a0f2bdf8c Ensure connections error get known by the caller
4 years ago
href 46dd276d68 ConnectionPool.Worker: Open gun conn in continue instead of init
4 years ago
rinpatch a705637dcf Connection Pool: fix LRFU implementation to not actually be LRU
4 years ago
rinpatch 9b73c35ca8 Request limiter setup: consider {:error, :existing} a success
4 years ago
rinpatch 12fa5541f0 FollowRedirects: Unconditionally release the connection if there is an error
4 years ago
rinpatch 37f1e781cb Gun adapter helper: fix wildcard cert issues on OTP 23
4 years ago
rinpatch 007843b75e Add documentation for new connection pool settings and remove some
4 years ago
rinpatch 7882f28569 Use erlang monotonic time for CRF calculation
4 years ago
rinpatch 00926a63fb Adapter Helper: Use built-in ip address type
4 years ago