Mark Felder
|
3462d4b995
|
Merge branch 'develop' into issue/1855
|
4 years ago |
|
Maksim Pechnikov
|
579763126f
|
Merge branch 'develop' into issue/1855
|
4 years ago |
|
Egor Kislitsyn
|
58e4e3db8b
|
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
|
4 years ago |
|
Maksim Pechnikov
|
2e8a236cef
|
fix invalidates media url's
|
4 years ago |
|
href
|
cb7be6eef2
|
Remove use of atoms in MRF.UserAllowListPolicy
|
4 years ago |
|
Egor Kislitsyn
|
697cf92024
|
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
|
4 years ago |
|
lain
|
4655407451
|
Apply suggestion to config/description.exs
|
4 years ago |
|
Egor Kislitsyn
|
1f35acce54
|
Merge OGP parser with TwitterCard
|
4 years ago |
|
Egor Kislitsyn
|
da22119c2f
|
Merge branch 'develop' into global-status-expiration
|
4 years ago |
|
lain
|
6977500ef7
|
Merge branch 'tagline' into 'develop'
Update default instance description
See merge request pleroma/pleroma!2600
|
4 years ago |
|
Egor Kislitsyn
|
a7627bdc7a
|
Merge remote-tracking branch 'origin/develop' into global-status-expiration
|
4 years ago |
|
lain
|
ac31f687c0
|
Config: Default to Hackney again
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
|
4 years ago |
|
Alex Gleason
|
d4a18d44fe
|
Update default instance description
|
4 years ago |
|
lain
|
337ca33e5e
|
Config: Restore old new background image
Became lost in a settings restructure
|
4 years ago |
|
Roman Chvanikov
|
8eb1dfadca
|
Update CHANGELOG and docs
|
4 years ago |
|
Roman Chvanikov
|
cc82229ba7
|
Add filename_display_max_length config
|
4 years ago |
|
eugenijm
|
b7fc61e17b
|
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
|
4 years ago |
|
Haelwenn
|
42b06d78df
|
Merge branch 'chore/update-config-fe' into 'develop'
Synchronize :fe settings in config.exs
See merge request pleroma/pleroma!2560
|
4 years ago |
|
Mark Felder
|
4c48626585
|
Also add new sidebarRight setting
|
4 years ago |
|
Haelwenn
|
94ba5a7802
|
Merge branch 'exposed-background-image' into 'develop'
InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545
|
4 years ago |
|
lain
|
6dd1575c64
|
Merge branch 'issue/1509' into 'develop'
[#1509] purge media from cache after delete
See merge request pleroma/pleroma!2539
|
4 years ago |
|
Mark Felder
|
918ee46417
|
Synchronize :fe settings in config.exs
|
4 years ago |
|
lain
|
188b32145e
|
InstanceView: Expose background image link.
This will make it easier for more clients to support this feature.
|
4 years ago |
|
Maksim Pechnikov
|
c33a4315fb
|
updated docs
|
4 years ago |
|
lain
|
64b3d81e50
|
Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
Remove settings that shouldn't be altered
Closes admin-fe#110
See merge request pleroma/pleroma!2540
|
4 years ago |
|
lain
|
4b28d812cf
|
Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
|
4 years ago |
|
Maksim Pechnikov
|
3f8d68bdf3
|
added example cache purge script
|
4 years ago |
|
Angelina Filippova
|
4a925b964a
|
Remove description of the settings that should't be altered
|
4 years ago |
|
Maksim Pechnikov
|
cb40602a16
|
added media proxy invalidation
|
4 years ago |
|
Mark Felder
|
54b4824186
|
Lint
|
4 years ago |
|
Mark Felder
|
6f53d8815e
|
Clarify where the Features panel is
|
4 years ago |
|
Mark Felder
|
2560a4aa56
|
Formatting
|
4 years ago |
|
Mark Felder
|
0c82a967ec
|
Add missing showFeaturesPanel setting
|
4 years ago |
|
Mark Felder
|
5131149056
|
add postContentType setting
|
4 years ago |
|
Mark Felder
|
52a95a0265
|
Add missing nsfwCensorImage option
|
4 years ago |
|
Mark Felder
|
923ab78807
|
Add missing hideSitename setting
|
4 years ago |
|
Mark Felder
|
c86cdb76a7
|
Add hideFilteredStatuses and hideMutedPosts settings
|
4 years ago |
|
Mark Felder
|
7f00698c3b
|
Add greentext option
|
4 years ago |
|
Mark Felder
|
38fb5eaf6a
|
formattingOptionsEnabled no longer exists
|
4 years ago |
|
Mark Felder
|
4bdde143f9
|
Add disableChat option
|
4 years ago |
|
Mark Felder
|
2420d7f439
|
Spelling/grammar
|
4 years ago |
|
Mark Felder
|
4aad764c1d
|
enableEmojiPicker is not a setting
|
4 years ago |
|
Mark Felder
|
2e28b50132
|
scopeOptionsEnabled has been replaced with minimalScopesMode
|
4 years ago |
|
Mark Felder
|
e2c80e62f1
|
Stickers setting does not exist
|
4 years ago |
|
Mark Felder
|
1e48aee50e
|
Alpha sort FE config descriptions
|
4 years ago |
|
Mark Felder
|
1b93581162
|
Synchronize suggestions with all available static/config.json settings
|
4 years ago |
|
Ivan Tashkinov
|
fd2fb2bb2e
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
|
4 years ago |
|
Alexander Strizhakov
|
da6a38d205
|
copy/paste fix for descriptions
|
4 years ago |
|
lain
|
7ca83e71a9
|
Merge branch 'shortening-modules-name' into 'develop'
Descriptions that module names are shortened
See merge request pleroma/pleroma!2428
|
4 years ago |
|
Ivan Tashkinov
|
b0d0d8f91b
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
4 years ago |
