diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-13 21:35:34 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-13 21:35:34 +0200 |
| commit | 0c4add69132ac69bba76091e4301b949e5428914 (patch) | |
| tree | 5cb10e0ee6f3a917d321679aec911bfd647a5bfb /data | |
| parent | d9e14621b5a0de1c189486bbc8c18a7b007d6965 (diff) | |
| parent | cda414ff0f142d180c616eca1e08204e7c9c6ef9 (diff) | |
Merge conflicts
https://github.com/FreshRSS/FreshRSS/pull/1172
Diffstat (limited to 'data')
| -rw-r--r-- | data/config.default.php | 4 | ||||
| -rw-r--r-- | data/users/_/config.default.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/data/config.default.php b/data/config.default.php index cae15330f..af1482d03 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -40,7 +40,6 @@ return array( # Login method: # `none` is without password and shows only the default user; # `form` is a conventional Web login form; - # `persona` is the email-based login by Mozilla; # `http_auth` is an access controled by the HTTP Web server (e.g. `/FreshRSS/p/i/.htaccess` for Apache) # if you use `http_auth`, remember to protect only `/FreshRSS/p/i/`, # and in particular not protect `/FreshRSS/p/api/` if you would like to use the API (different login system). @@ -67,6 +66,9 @@ return array( # Allow or not Web robots (e.g. search engines) in HTML headers. 'allow_robots' => false, + # If true does nothing, if false restricts HTTP Referer via: meta referrer origin + 'allow_referrer' => false, + 'limits' => array( # Duration in seconds of the SimplePie cache, diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php index 8f8ff528c..4a3403453 100644 --- a/data/users/_/config.default.php +++ b/data/users/_/config.default.php @@ -5,7 +5,6 @@ return array ( 'old_entries' => 3, 'keep_history_default' => 0, 'ttl_default' => 3600, - 'mail_login' => '', 'token' => '', 'passwordHash' => '', 'apiPasswordHash' => '', |