lain
988ca4ab6a
Test Config: Don't have any MRFs by default
3 jaren geleden
lain
953f71bcfa
App Test: Make more resilient
3 jaren geleden
lain
28584bb224
Merge branch 'email-blacklist' into 'develop'
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
3 jaren geleden
lain
2f4289d455
Changelog: Add info about email blacklist
3 jaren geleden
Alex Gleason
4f57e85ab9
Email blacklist: Update phrasing again
3 jaren geleden
Alex Gleason
058daf498f
Email blacklist: Update response phrasing
3 jaren geleden
lain
e3953923ac
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
3 jaren geleden
Ilja
cbf8bfc694
Improved WelcomeChatMessageTest
* Checks if message is the same using ==/2 instead of =~/2
3 jaren geleden
Ilja
13e5540c2c
Apply 1 suggestion(s) to 1 file(s)
3 jaren geleden
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
Follower mrf again
See merge request pleroma/pleroma!2833
3 jaren geleden
lain
de3bdc63ad
AccountControllerTest: Add test for message returned.
3 jaren geleden
lain
66ebd88634
Merge branch 'config/default_ok_oldage' into 'develop'
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
3 jaren geleden
lain
5876d5123c
Merge branch 'object-age-fix' into 'develop'
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
3 jaren geleden
lain
10c792110e
MRF Object Age Policy: Don't break on messages without cc/to
3 jaren geleden
lain
e45e07d2b5
Merge branch 'indigenous-client' into 'develop'
Add indigenous to clients
See merge request pleroma/pleroma!2835
3 jaren geleden
lain
8fcbfd961d
Merge branch 'reportnote-test' into 'develop'
ReportNote test
Closes #2014
See merge request pleroma/pleroma!2839
3 jaren geleden
Alex Gleason
f9301044ed
Add ReportNote test
3 jaren geleden
Alex Gleason
77b48cb4ce
Factory: Add report_activity_factory
3 jaren geleden
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
3 jaren geleden
swentel
0012894d4e
Add indigenous to clients
3 jaren geleden
Ilja
f671d7e68c
Add welcome chatmessages
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
3 jaren geleden
Alex Gleason
cb1e3893aa
SimpleMRF: Add missing :followers_only to config.exs
3 jaren geleden
lain
70951d042b
Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'
[#1985 ] Prevented force login on registration if account approval and/or email confirmation needed
Closes #1985
See merge request pleroma/pleroma!2823
3 jaren geleden
rinpatch
69b9c328c9
Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'
ConnectionPool: fix gun open errors being returned without an error tuple
Closes #2008
See merge request pleroma/pleroma!2832
3 jaren geleden
rinpatch
45be1fe00e
ConnectionPool: fix gun open errors being returned without an error tuple
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
3 jaren geleden
rinpatch
3a6a4dd77a
Merge branch 'fix/gun-limiter' into 'develop'
Fix ConnecitonPool deadlocking after reaching the connection limit
Closes #1977
See merge request pleroma/pleroma!2830
3 jaren geleden
rinpatch
87180ff817
Fix ConnecitonPool deadlocking after reaching the connection limit
The issue was with ConcurrentLimiter not decrementing counters on
overload. It was fixed in the latest commit, but concurrentlimiter
version wasn't updated in Pleroma for some reason.
Closes #1977
3 jaren geleden
rinpatch
f1f4b1863f
Merge branch 'fix/user-agent-overriding' into 'develop'
Don't override user-agent header if it's been set
Closes #1923
See merge request pleroma/pleroma!2829
3 jaren geleden
Roman Chvanikov
4bf44b7d65
Don't override user-agent header if it's been set
3 jaren geleden
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
This reverts merge request !2825
3 jaren geleden
lain
8ca993c789
Merge branch 'revert-1ac0969c' into 'develop'
Revert "Merge branch 'mrf-silence-2' into 'develop'"
See merge request pleroma/pleroma!2825
3 jaren geleden
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
This reverts merge request !2820
3 jaren geleden
lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
3 jaren geleden
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.
3 jaren geleden
lain
37b9e5e138
Apply 1 suggestion(s) to 1 file(s)
3 jaren geleden
Haelwenn (lanodan) Monnier
0309514656
Default MRF to ObjectAgePolicy, 7 days threshold
3 jaren geleden
lain
a1a43f39dc
Merge branch 'deactivate-gun-again' into 'develop'
Config: Default to Hackney again
See merge request pleroma/pleroma!2821
3 jaren geleden
lain
7bcd2e948e
Config: Default to Hackney again
Gun is still acting up.
3 jaren geleden
lain
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
3 jaren geleden
feld
ac0a8dfdd4
Merge branch 'chore/fix-docs-typo' into 'develop'
Fix example json response
See merge request pleroma/pleroma!2819
3 jaren geleden
Mark Felder
052833f8ee
Fix example json response
3 jaren geleden
feld
09aef71db9
Merge branch 'fix/configdb-otp-instructions' into 'develop'
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
See merge request pleroma/pleroma!2817
3 jaren geleden
Haelwenn
d1cf1108ac
Merge branch 'render-preview-cards-in-chats' into 'develop'
Render preview cards in chats
See merge request pleroma/pleroma!2816
3 jaren geleden
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
3 jaren geleden
Mark Felder
24169ae2e6
Merge branch 'develop' into fix/configdb-otp-instructions
3 jaren geleden
lain
a3c37379e9
ChatMessage schema: Add preview cards.
3 jaren geleden
lain
781b270863
ChatMessageReferenceView: Display preview cards.
3 jaren geleden
Mark Felder
cfc6484c40
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
3 jaren geleden
feld
16b7b494ba
Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'
Attempt to fix markdown formatting
See merge request pleroma/pleroma!2815
3 jaren geleden
Mark Felder
1f24186036
Attempt to fix markdown formatting
3 jaren geleden