Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index f725d7719be0d569531626c0e40dd4f635af48b5..a660c6b33dcd79b690ed8cd83161664a859afd9d 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -131,7 +131,7 @@ $default =
               'delete' => false,
               'move' => true),
         'image' =>
-        array('jpegquality' => 85),
+        array('jpegquality' => 95),
         'avatar' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/avatar/',
@@ -249,6 +249,7 @@ $default =
               'user_quota' => 50000000,
               'monthly_quota' => 15000000,
               'uploads' => true,
+              'show_html' => false,  // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls.
               'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info
               'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages.
               ),
@@ -269,7 +270,7 @@ $default =
               'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
               'desclimit' => null),
         'oembed' =>
-        array('endpoint' => 'https://noembed.com/embed/',
+        array('endpoint' => null,   // 'https://noembed.com/embed/' for proxied oEmbed data
               'order' => array('built-in', 'well-known', 'service', 'discovery'),
         ),
         'search' =>
@@ -293,6 +294,7 @@ $default =
         array('core' => array(
                             'AuthCrypt' => array(),
                             'Cronish' => array(),
+                            'Favorite' => array(),
                             'LRDD' => array(),
                             'StrictTransportSecurity' => array(),
                         ),
@@ -301,6 +303,7 @@ $default =
                             'Bookmark' => array(),
                             'ClientSideShorten' => array(),
                             'Directory' => array(),
+                            'DirectMessage' => array(),
                             'EmailAuthentication' => array(),
                             'Event' => array(),
                             'Oembed' => array(),