rinpatch
ce3474f4d3
Disable favicon scraping in tests
4 years ago
rinpatch
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
4 years ago
rinpatch
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
4 years ago
rinpatch
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
4 years ago
lain
6d6e43fd09
Description: Update description.
4 years ago
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Angelina Filippova
6e5678b5af
Add Pleroma.Web.Preload to description.exs
4 years ago
Haelwenn
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
4 years ago
lain
83cef25794
Merge branch 'chore/improve-descriptions' into 'develop'
...
Improve description for mediaproxy cache invalidation settings
See merge request pleroma/pleroma!2891
4 years ago
lain
52a79506c7
Test config: Default to filename for descriptions
4 years ago
lain
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
4 years ago
Mark Felder
6c3130ef47
Improve description for mediaproxy cache invalidation settings
4 years ago
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
feld
dfc56de167
Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
...
Update :welcome settings in description.exs
Closes #2024
See merge request pleroma/pleroma!2843
4 years ago
lain
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
4 years ago
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
Angelina Filippova
f21b6ebd5d
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
4 years ago
Angelina Filippova
8e1f7a3eff
Add new `image` type to settings whose values are image urls
4 years ago
rinpatch
325c7c924b
Make Floki use fast_html
4 years ago
lain
3f88366e2a
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim Pechnikov
8e90cc58e7
Merge branch 'develop' into feature/update-welcome-setting-in-description
4 years ago
Maksim Pechnikov
6e6276b4f8
added test
4 years ago
Alex Gleason
e639eee82e
restricted_nicknames: Add names from MastoAPI endpoints
4 years ago
lain
03da653a12
Description: Refactor.
4 years ago
lain
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Mark Felder
d5e4d8a6f3
Define default authenticator in the config
4 years ago
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Angelina Filippova
8bb5441547
Update descriptions in :frontends group
4 years ago
lain
988ca4ab6a
Test Config: Don't have any MRFs by default
4 years ago
lain
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
4 years ago
Angelina Filippova
63b1ca6a07
Add label to :restrict_unauthenticated setting, fix typos
4 years ago
Angelina Filippova
ae95472dcc
Update :welcome settings description
4 years ago
Angelina Filippova
1489c2ae5f
Fix :args settings description in Upload.Filter.Mogrify group
4 years ago
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
4 years ago
Ilja
13e5540c2c
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
187d9bda0f
Description: Add new fields for frontend configuration.
4 years ago
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
4 years ago
lain
66ebd88634
Merge branch 'config/default_ok_oldage' into 'develop'
...
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
4 years ago
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
4 years ago
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
4 years ago
Alex Gleason
cb1e3893aa
SimpleMRF: Add missing :followers_only to config.exs
4 years ago
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
4 years ago
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
4 years ago
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
0309514656
Default MRF to ObjectAgePolicy, 7 days threshold
4 years ago
lain
7bcd2e948e
Config: Default to Hackney again
...
Gun is still acting up.
4 years ago
lain
99bfdffb1d
Config: Add kenoma as available frontend.
4 years ago
lain
4ce4d799fd
Config: Add frontend information.
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