diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-10-30 20:15:11 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-10-30 20:15:11 +0100 |
| commit | 1d3e5bdee069434fd65c2717ae8fcce8c54fe81d (patch) | |
| tree | 39b0ae9ac0b0d1ed7fa11c747a0523cb3faa384b /data | |
| parent | 17c8c039df675b3b0f8d88d14f7316a240eabe76 (diff) | |
| parent | 29e1f048159b7a580bdf1bab184e928f11d104b4 (diff) | |
Merge pull request #1346 from FreshRSS/dev1.6.0
Merge 1.6.0-dev in master
Diffstat (limited to 'data')
| -rw-r--r-- | data/.gitignore | 10 | ||||
| -rw-r--r-- | data/PubSubHubbub/feeds/.gitignore | 4 | ||||
| -rw-r--r-- | data/config.default.php | 3 | ||||
| -rw-r--r-- | data/persona/.gitignore | 1 | ||||
| -rw-r--r-- | data/persona/index.html | 13 | ||||
| -rw-r--r-- | data/users/.gitignore | 9 | ||||
| -rw-r--r-- | data/users/_/config.default.php | 8 |
7 files changed, 20 insertions, 28 deletions
diff --git a/data/.gitignore b/data/.gitignore index c2ed350a6..76314fc12 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1,10 +1,6 @@ -application.ini config.php -*.sqlite -touch.txt -no-cache.txt -*.bak.php -*.lock.txt +config.php.bak.php +force-https.txt last_update.txt +no-cache.txt update.php -force-https.txt diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore index 150f68c80..d8f9df042 100644 --- a/data/PubSubHubbub/feeds/.gitignore +++ b/data/PubSubHubbub/feeds/.gitignore @@ -1 +1,3 @@ -*/* +*/ +*/*.json +*/*.txt diff --git a/data/config.default.php b/data/config.default.php index af1482d03..d3cd3bf22 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -27,6 +27,9 @@ return array( # Title of this FreshRSS instance in the Web user interface. 'title' => 'FreshRSS', + # Meta description used when `allow_robots` is true. + 'meta_description' => '', + # Name of the user that has administration rights. 'default_user' => '_', diff --git a/data/persona/.gitignore b/data/persona/.gitignore deleted file mode 100644 index 314f02b1b..000000000 --- a/data/persona/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.txt
\ No newline at end of file diff --git a/data/persona/index.html b/data/persona/index.html deleted file mode 100644 index 85faaa37e..000000000 --- a/data/persona/index.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB"> -<head> -<meta charset="UTF-8" /> -<meta http-equiv="Refresh" content="0; url=/" /> -<title>Redirection</title> -<meta name="robots" content="noindex" /> -</head> - -<body> -<p><a href="/">Redirection</a></p> -</body> -</html> diff --git a/data/users/.gitignore b/data/users/.gitignore index a8b7cd60f..3705c06b7 100644 --- a/data/users/.gitignore +++ b/data/users/.gitignore @@ -1,4 +1,5 @@ -db.sqlite -config.php -log*.txt - +*/ +*/config.php +*/db.sqlite +!_/ +*/log*.txt diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php index 4a3403453..f28ef9724 100644 --- a/data/users/_/config.default.php +++ b/data/users/_/config.default.php @@ -3,12 +3,16 @@ return array ( 'language' => 'en', 'old_entries' => 3, - 'keep_history_default' => 0, + 'keep_history_default' => 50, 'ttl_default' => 3600, + 'mail_login' => '', 'token' => '', 'passwordHash' => '', 'apiPasswordHash' => '', 'posts_per_page' => 20, + 'since_hours_posts_per_rss' => 168, + 'min_posts_per_rss' => 2, + 'max_posts_per_rss' => 400, 'view_mode' => 'normal', 'default_view' => 'adaptive', 'default_state' => FreshRSS_Entry::STATE_NOT_READ, @@ -31,7 +35,7 @@ return array ( 'mark_when' => array ( 'article' => true, 'site' => true, - 'scroll' => false, + 'scroll' => true, 'reception' => false, ), 'theme' => 'Origine', |