Merge remote-tracking branch 'upstream/develop' into write-tags

[friendica.git] / static / defaults.config.php

diff --git a/static/defaults.config.php b/static/defaults.config.php
index ab47eef19ce40e0ca90f85e5c0cba30bb9892968..d0725aa9bcdb2418f498ef9b2dc7e4a919d31436 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -273,6 +273,10 @@ return [
                // Maximum number of queue items for a single contact before subsequent messages are discarded.
                'max_contact_queue' => 500,
 
+               // max_feed_items (Integer)
+               // Maximum number of feed items that are fetched and processed. For unlimited items set to 0.
+               'max_feed_items' => 20,
+
                // max_image_length (Integer)
                // An alternate way of limiting picture upload sizes.
                // Specify the maximum pixel  length that pictures are allowed to be (for non-square pictures, it will apply to the longest side).
@@ -496,6 +500,10 @@ return [
                // Logs every call to /inbox as a JSON file in Friendica's temporary directory
                'ap_inbox_log' => false,
 
+               // show_direction (Boolean)
+               // Display if a post had been fetched or had been pushed towards our server
+               'show_direction' => false,
+
                // total_ap_delivery (Boolean)
                // Deliver via AP to every possible receiver and we suppress the delivery to these contacts with other protocols
                'total_ap_delivery' => false,