lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
4 years ago
Haelwenn (lanodan) Monnier
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
4 years ago
Ivan Tashkinov
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
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'
...
Render preview cards in chats
See merge request pleroma/pleroma!2816
4 years ago
Haelwenn
87fe31fb5c
Merge branch '1993-confirm-users-on-registration' into 'develop'
...
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
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'
...
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
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
a6d3bb5f30
Merge branch 'issue/1023' into 'develop'
...
[#1023 ] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
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'
...
EnsureRePrepended: Don't break on chat messages.
Closes #1996
See merge request pleroma/pleroma!2808
4 years ago
lain
de5c7e20a3
Merge branch 'bugfix/remote-user-atom' into 'develop'
...
feed/user_controller: Return 404 when the user is remote
Closes #1911
See merge request pleroma/pleroma!2811
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'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
4 years ago
lain
c25c21dd22
AccountController: Don't explicitly ask to keep users unconfirmed.
...
Confirmation is set in User.register_changeset based on the config
settings.
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
...
The slowdown from this is most likely immesurable, however it eliminates
possible false positives when tracking dead clients.
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'
...
masto_fe_view: Remove @default_settings
See merge request pleroma/pleroma!2799
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'
...
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
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'
...
[#1934 ] welcome email
See merge request pleroma/pleroma!2786
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'
...
ReverseProxy: Fix a gun connection leak when there is an error with no body
See merge request pleroma/pleroma!2798
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
...
This is no longer relevant because we use a custom
FollowRedirects middleware now
4 years ago
rinpatch
d4fbec62a3
ReverseProxy: Fix a gun connection leak when there is an error with no
...
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
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
Mark Felder
65a1b048a8
Ensure Oban is available during mix tasks.
...
Fixes: mix pleroma.user rm username
4 years ago
Mark Felder
9be6668236
Fix mix tasks that make HTTP calls by starting the Gun connection pool
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'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
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'
...
StatusView: Handle badly formatted emoji reactions.
Closes #1976
See merge request pleroma/pleroma!2788
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'
...
[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
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'
...
Fix #783 : Make MRF reject log as info level instead of error
Closes #783
See merge request pleroma/pleroma!2758
4 years ago
lain
250e0369c7
Merge branch 'issue/1878' into 'develop'
...
[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
4 years ago
lain
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
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.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
4 years ago
lain
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
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
Maksim Pechnikov
8d6f7aec21
Merge branch 'develop' into issue/1023
4 years ago
Mark Felder
341a8f3500
Skip the correct plug
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
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'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
4 years ago
lain
fa2421dd7e
Merge branch 'gopher-fix' into 'develop'
...
Gopher: using atom keys in search params
See merge request pleroma/pleroma!2775
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'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
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
Maksim
16da9f5cfd
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim
c72676d22f
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim Pechnikov
6c59fe259d
Merge branch 'develop' into issue/1023
4 years ago
Maksim Pechnikov
4e0e19a706
update task messages
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'
...
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
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
...
This produced error log messages about GenServer termination
every time the connection was not open due to a timeout.
Instead we stop with `{:shutdown, <gun_error>}` since shutting down
when the connection can't be established is normal behavior.
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
...
- `verify_fun` is not useful now
- use `customize_check_hostname` (OTP 20+ so OK)
- `partial_chain` is useless as of OTP 21.1 (wasn't there, but hackney/..
uses it)
4 years ago
href
53ba6815b1
parentheses...
4 years ago