diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-11-04 20:17:29 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-11-04 20:17:29 +0100 |
| commit | a1267baa0b1caa801547ee674d9bb03c4b15d00b (patch) | |
| tree | 78c5567578751752a3623574cbd768e602a46754 /data | |
| parent | 133e369afff02e5984fe4ce5109e33fd2fbccfc7 (diff) | |
| parent | 4525e547faa8781e37f86125110f28248eb67fd3 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'data')
| -rw-r--r-- | data/config.default.php | 6 | ||||
| -rw-r--r-- | data/shares.php | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/data/config.default.php b/data/config.default.php index a7a29b12c..174592a21 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -18,6 +18,9 @@ return array( # https://freshrss.example.net/ 'base_url' => '', + # Specify address of the FreshRSS auto-update server. + 'auto_update_url' => 'https://update.freshrss.org', + # Natural language of the user interface, e.g. `en`, `fr`. 'language' => 'en', @@ -61,6 +64,9 @@ return array( # /!\ It should NOT be enabled if base_url is not reachable by an external server. 'pubsubhubbub_enabled' => false, + # Allow or not Web robots (e.g. search engines) in HTML headers. + 'allow_robots' => false, + 'limits' => array( # Duration in seconds of the SimplePie cache, diff --git a/data/shares.php b/data/shares.php index 6e0e9ea0c..ed060074e 100644 --- a/data/shares.php +++ b/data/shares.php @@ -44,6 +44,12 @@ return array( 'help' => 'https://diasporafoundation.org/', 'form' => 'advanced', ), + 'movim' => array( + 'url' => '~URL~/index.php/share/~LINK~', + 'transform' => array('rawurlencode', 'urlencode'), + 'help' => 'https://github.com/edhelas/movim', + 'form' => 'advanced', + ), 'twitter' => array( 'url' => 'https://twitter.com/share?url=~LINK~&text=~TITLE~', 'transform' => array('rawurlencode'), |