8fcbfd961d
Merge branch 'reportnote-test' into 'develop'
...
ReportNote test
Closes #2014
See merge request pleroma/pleroma!2839
4 years ago
f9301044ed
Add ReportNote test
4 years ago
77b48cb4ce
Factory: Add report_activity_factory
4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
3a6a4dd77a
Merge branch 'fix/gun-limiter' into 'develop'
...
Fix ConnecitonPool deadlocking after reaching the connection limit
Closes #1977
See merge request pleroma/pleroma!2830
4 years ago
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
4 years ago
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
4 years ago
4bf44b7d65
Don't override user-agent header if it's been set
4 years ago
8ca993c789
Merge branch 'revert-1ac0969c' into 'develop'
...
Revert "Merge branch 'mrf-silence-2' into 'develop'"
See merge request pleroma/pleroma!2825
4 years ago
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
4 years ago
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
4 years ago
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
37b9e5e138
Apply 1 suggestion(s) to 1 file(s)
4 years ago
a1a43f39dc
Merge branch 'deactivate-gun-again' into 'develop'
...
Config: Default to Hackney again
See merge request pleroma/pleroma!2821
4 years ago
7bcd2e948e
Config: Default to Hackney again
...
Gun is still acting up.
4 years ago
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
4 years ago
ac0a8dfdd4
Merge branch 'chore/fix-docs-typo' into 'develop'
...
Fix example json response
See merge request pleroma/pleroma!2819
4 years ago
052833f8ee
Fix example json response
4 years ago
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
4 years ago
d1cf1108ac
Merge branch 'render-preview-cards-in-chats' into 'develop'
...
Render preview cards in chats
See merge request pleroma/pleroma!2816
4 years ago
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
24169ae2e6
Merge branch 'develop' into fix/configdb-otp-instructions
4 years ago
a3c37379e9
ChatMessage schema: Add preview cards.
4 years ago
781b270863
ChatMessageReferenceView: Display preview cards.
4 years ago
cfc6484c40
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
4 years ago
16b7b494ba
Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'
...
Attempt to fix markdown formatting
See merge request pleroma/pleroma!2815
4 years ago
1f24186036
Attempt to fix markdown formatting
4 years ago
873ff5ce14
Merge branch 'hide-reactions' into 'develop'
...
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
4 years ago
e2e66e50d3
SimplePolicyTest: Add test for leaking DMs.
4 years ago
d39b72c8fa
Merge branch 'feature/captcha-expose-timeout' into 'develop'
...
Expose seconds_valid in Pleroma Captcha API endpoint
Closes #1954
See merge request pleroma/pleroma!2812
4 years ago
20d89472e3
Apply 1 suggestion(s) to 1 file(s)
4 years ago
a0623c5db2
Merge branch 'issue/1933-update-dependency' into 'develop'
...
[#1933 ] update dependency
See merge request pleroma/pleroma!2813
4 years ago
56171cbde6
set versions
4 years ago
b261135683
updated `cors_plug`
4 years ago
aac7e0314e
set `postgrex` version
4 years ago
4f10ef5e46
set `web_push_encryption` version
4 years ago
df82839c30
updated `calendar` package
4 years ago
cff7bb5cd4
Merge branch 'develop' into issue/1933-update-dependency
4 years ago
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
4 years ago
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
00d090004e
:show_reactions, refactor the other test
4 years ago
026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
4 years ago
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
a6d3bb5f30
Merge branch 'issue/1023' into 'develop'
...
[#1023 ] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
4 years ago
d9bf2c58df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
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
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
lain