lain
|
37b9e5e138
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
0309514656
|
Default MRF to ObjectAgePolicy, 7 days threshold
|
4 years ago |
|
lain
|
a1a43f39dc
|
Merge branch 'deactivate-gun-again' into 'develop'
Config: Default to Hackney again
See merge request pleroma/pleroma!2821
|
4 years ago |
|
lain
|
7bcd2e948e
|
Config: Default to Hackney again
Gun is still acting up.
|
4 years ago |
|
lain
|
1dd162a5f7
|
SimplePolicy: Fix problem with DM leaks.
|
4 years ago |
|
feld
|
ac0a8dfdd4
|
Merge branch 'chore/fix-docs-typo' into 'develop'
Fix example json response
See merge request pleroma/pleroma!2819
|
4 years ago |
|
Mark Felder
|
052833f8ee
|
Fix example json response
|
4 years ago |
|
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
|
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 |
|
Mark Felder
|
24169ae2e6
|
Merge branch 'develop' into fix/configdb-otp-instructions
|
4 years ago |
|
lain
|
a3c37379e9
|
ChatMessage schema: Add preview cards.
|
4 years ago |
|
lain
|
781b270863
|
ChatMessageReferenceView: Display preview cards.
|
4 years ago |
|
Mark Felder
|
cfc6484c40
|
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
|
4 years ago |
|
feld
|
16b7b494ba
|
Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'
Attempt to fix markdown formatting
See merge request pleroma/pleroma!2815
|
4 years ago |
|
Mark Felder
|
1f24186036
|
Attempt to fix markdown formatting
|
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 |
|
lain
|
e2e66e50d3
|
SimplePolicyTest: Add test for leaking DMs.
|
4 years ago |
|
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
|
4 years ago |
|
lain
|
20d89472e3
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
lain
|
a0623c5db2
|
Merge branch 'issue/1933-update-dependency' into 'develop'
[#1933] update dependency
See merge request pleroma/pleroma!2813
|
4 years ago |
|
Maksim Pechnikov
|
56171cbde6
|
set versions
|
4 years ago |
|
Maksim Pechnikov
|
b261135683
|
updated `cors_plug`
|
4 years ago |
|
Maksim Pechnikov
|
aac7e0314e
|
set `postgrex` version
|
4 years ago |
|
Maksim Pechnikov
|
4f10ef5e46
|
set `web_push_encryption` version
|
4 years ago |
|
Maksim Pechnikov
|
df82839c30
|
updated `calendar` package
|
4 years ago |
|
Maksim Pechnikov
|
cff7bb5cd4
|
Merge branch 'develop' into issue/1933-update-dependency
|
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
|
00d090004e
|
:show_reactions, refactor the other test
|
4 years ago |
|
Alex Gleason
|
026a51cb27
|
:show_reactions, add CHANGELOG.md, refactor test
|
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 |
|
Maksim Pechnikov
|
cd2423d7f5
|
update mogrify package
|
4 years ago |
|
Maksim Pechnikov
|
b4603a9c9c
|
set http_signatures version
|
4 years ago |
|
Maksim Pechnikov
|
d6e36aaf06
|
set `jason` version
|
4 years ago |
|
Maksim Pechnikov
|
88f57418c8
|
updated `pot` package
|
4 years ago |
|
Maksim Pechnikov
|
992a271196
|
updated the minor version packages
|
4 years ago |
|
Maksim Pechnikov
|
ed881247b7
|
set swoosh version
|
4 years ago |
|
Maksim Pechnikov
|
15b8446cdb
|
updated dev & test packages
|
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 |
