diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2016-07-23 17:11:38 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2016-07-23 17:11:38 +0200 |
| commit | 3f705cf03ccd919e0930bc3e95b98daff9f0560a (patch) | |
| tree | e12c530198e3d5ee7032d5aaa381e7ecc8781cdf /data | |
| parent | ca6ca218dca17c3806191f72fa2b3fe02acc1692 (diff) | |
| parent | 43f3be7098a908321c29a14a1fbe542389479155 (diff) | |
Merge branch 'dev'
Diffstat (limited to 'data')
| -rw-r--r-- | data/.gitignore | 1 | ||||
| -rw-r--r-- | data/config.default.php | 2 | ||||
| -rw-r--r-- | data/force-https.default.txt | 7 | ||||
| -rw-r--r-- | data/shares.php | 16 |
4 files changed, 24 insertions, 2 deletions
diff --git a/data/.gitignore b/data/.gitignore index 20364e266..c2ed350a6 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -7,3 +7,4 @@ no-cache.txt *.lock.txt last_update.txt update.php +force-https.txt diff --git a/data/config.default.php b/data/config.default.php index 174592a21..cae15330f 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -75,7 +75,7 @@ return array( 'cache_duration' => 800, # SimplePie HTTP request timeout in seconds. - 'timeout' => 10, + 'timeout' => 15, # If a user has not used FreshRSS for more than x seconds, # then its feeds are not refreshed anymore. diff --git a/data/force-https.default.txt b/data/force-https.default.txt new file mode 100644 index 000000000..044620098 --- /dev/null +++ b/data/force-https.default.txt @@ -0,0 +1,7 @@ +dailymotion.com +feedburner.com +gravatar.com +gstatic.com +tumblr.com +wordpress.com +youtube.com diff --git a/data/shares.php b/data/shares.php index ed060074e..1295a26ac 100644 --- a/data/shares.php +++ b/data/shares.php @@ -38,6 +38,15 @@ return array( 'help' => 'http://www.wallabag.org/', 'form' => 'advanced', ), + 'wallabagv2' => array( + 'url' => '~URL~/bookmarklet?url=~LINK~', + 'transform' => array( + 'link' => array('rawurlencode'), + 'title' => array(), + ), + 'help' => 'http://www.wallabag.org/', + 'form' => 'advanced', + ), 'diaspora' => array( 'url' => '~URL~/bookmarklet?url=~LINK~&title=~TITLE~', 'transform' => array('rawurlencode'), @@ -45,7 +54,7 @@ return array( 'form' => 'advanced', ), 'movim' => array( - 'url' => '~URL~/index.php/share/~LINK~', + 'url' => '~URL~/?share/~LINK~', 'transform' => array('rawurlencode', 'urlencode'), 'help' => 'https://github.com/edhelas/movim', 'form' => 'advanced', @@ -75,4 +84,9 @@ return array( 'transform' => array(), 'form' => 'simple', ), + 'jdh' => array( + 'url' => 'https://www.journalduhacker.net/stories/new?url=~LINK~&title=~TITLE~', + 'transform' => array('rawurlencode'), + 'form' => 'simple', + ), ); |