diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-06-12 22:21:57 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-06-12 22:21:57 +0200 |
| commit | 7bc2ff45009a601550d77007c94ec23e2ced8f19 (patch) | |
| tree | 8f175b55e291a152d2811d85f4a6d085f18f6849 /data | |
| parent | 8dcc0fd65a36adedb12e5d54bafb39e7e553d38b (diff) | |
| parent | 17de4363b5b0ab3f3ddc703ccf98332770040e17 (diff) | |
Merge pull request #1165 from FreshRSS/dev1.3.2-beta
Release 1.3.2-beta
Diffstat (limited to 'data')
| -rw-r--r-- | data/config.default.php | 2 | ||||
| -rw-r--r-- | data/shares.php | 9 |
2 files changed, 10 insertions, 1 deletions
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/shares.php b/data/shares.php index 264c8fed7..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'), |