fedward/distraction.party
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
11167 commits 4 branches 73 tags 294 MiB
Commit graph

11167 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Gleason
cb1e3893aa
SimpleMRF: Add missing :followers_only to config.exs 2020-08-01 16:08:29 -05:00
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
 2020-08-01 15:58:17 +00:00
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
 2020-08-01 15:17:41 +00:00
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
 2020-08-01 18:02:26 +03:00
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
 2020-08-01 10:49:35 +00:00
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
 2020-08-01 12:18:56 +03:00
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
 2020-08-01 07:25:32 +00:00
Roman Chvanikov
4bf44b7d65 Don't override user-agent header if it's been set 2020-08-01 10:04:25 +03:00
lain
4b18a07392 Revert "Merge branch 'revert-1ac0969c' into 'develop'" 
This reverts merge request !2825
 2020-07-31 15:18:04 +00:00
lain
8ca993c789 Merge branch 'revert-1ac0969c' into 'develop' 
Revert "Merge branch 'mrf-silence-2' into 'develop'"

See merge request pleroma/pleroma!2825
 2020-07-31 15:17:33 +00:00
lain
010d77ec85 Revert "Merge branch 'mrf-silence-2' into 'develop'" 
This reverts merge request !2820
 2020-07-31 15:17:09 +00:00
lain
1ac0969c72 Merge branch 'mrf-silence-2' into 'develop' 
MRF silencing alternative solution

See merge request pleroma/pleroma!2820
 2020-07-31 14:43:33 +00:00
Haelwenn (lanodan) Monnier
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation 2020-07-31 13:57:21 +02:00
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.
 2020-07-31 14:13:38 +03:00
lain
37b9e5e138 Apply 1 suggestion(s) to 1 file(s) 2020-07-31 10:29:16 +00:00
Haelwenn (lanodan) Monnier
0309514656
Default MRF to ObjectAgePolicy, 7 days threshold 2020-07-31 12:13:08 +02:00
lain
a1a43f39dc Merge branch 'deactivate-gun-again' into 'develop' 
Config: Default to Hackney again

See merge request pleroma/pleroma!2821
 2020-07-31 09:11:24 +00:00
lain
7bcd2e948e Config: Default to Hackney again 
Gun is still acting up.
 2020-07-31 10:50:45 +02:00
lain
1dd162a5f7 SimplePolicy: Fix problem with DM leaks. 2020-07-31 09:57:30 +02:00
feld
ac0a8dfdd4 Merge branch 'chore/fix-docs-typo' into 'develop' 
Fix example json response

See merge request pleroma/pleroma!2819
 2020-07-30 21:25:30 +00:00
Mark Felder
052833f8ee Fix example json response 2020-07-30 15:57:41 -05:00
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
 2020-07-30 20:28:28 +00:00
Haelwenn
d1cf1108ac Merge branch 'render-preview-cards-in-chats' into 'develop' 
Render preview cards in chats

See merge request pleroma/pleroma!2816
 2020-07-30 20:08:03 +00:00
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
 2020-07-30 20:01:04 +00:00
Mark Felder
24169ae2e6 Merge branch 'develop' into fix/configdb-otp-instructions 2020-07-30 13:04:49 -05:00
lain
a3c37379e9 ChatMessage schema: Add preview cards. 2020-07-30 19:57:45 +02:00
lain
781b270863 ChatMessageReferenceView: Display preview cards. 2020-07-30 19:57:26 +02:00
Mark Felder
cfc6484c40 OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions. 2020-07-30 12:37:56 -05:00
feld
16b7b494ba Merge branch 'chore/fix-configdb-docs-formatting' into 'develop' 
Attempt to fix markdown formatting

See merge request pleroma/pleroma!2815
 2020-07-30 17:29:31 +00:00
Mark Felder
1f24186036 Attempt to fix markdown formatting 2020-07-30 12:01:46 -05:00
lain
873ff5ce14 Merge branch 'hide-reactions' into 'develop' 
Let favourites and emoji reactions optionally be hidden

See merge request pleroma/pleroma!2804
 2020-07-30 12:41:47 +00:00
lain
e2e66e50d3 SimplePolicyTest: Add test for leaking DMs. 2020-07-30 14:29:00 +02:00
lain
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
 2020-07-30 08:41:46 +00:00
lain
20d89472e3 Apply 1 suggestion(s) to 1 file(s) 2020-07-30 08:00:07 +00:00
lain
a0623c5db2 Merge branch 'issue/1933-update-dependency' into 'develop' 
[#1933] update dependency

See merge request pleroma/pleroma!2813
 2020-07-30 07:57:26 +00:00
Maksim Pechnikov
56171cbde6 set versions 2020-07-30 09:23:35 +03:00
Maksim Pechnikov
b261135683 updated cors_plug 2020-07-30 09:12:42 +03:00
Maksim Pechnikov
aac7e0314e set postgrex version 2020-07-30 09:08:50 +03:00
Maksim Pechnikov
4f10ef5e46 set web_push_encryption version 2020-07-30 09:08:03 +03:00
Maksim Pechnikov
df82839c30 updated calendar package 2020-07-30 08:58:19 +03:00
Maksim Pechnikov
cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency 2020-07-30 08:52:13 +03:00
Mark Felder
33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint 2020-07-29 16:07:22 -05:00
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence 2020-07-29 13:01:16 -05:00
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only 2020-07-29 12:58:08 -05:00
Alex Gleason
00d090004e
:show_reactions, refactor the other test 2020-07-29 12:50:11 -05:00
Alex Gleason
026a51cb27
:show_reactions, add CHANGELOG.md, refactor test 2020-07-29 12:45:32 -05:00
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions 2020-07-29 12:43:39 -05:00
lain
a6d3bb5f30 Merge branch 'issue/1023' into 'develop' 
[#1023] added generated  `pleroma.env`

See merge request pleroma/pleroma!2763
 2020-07-29 13:45:15 +00:00
lain
d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration 2020-07-29 14:42:09 +02:00
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
 2020-07-29 12:20:04 +00:00