diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-12-19 17:56:57 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-12-19 17:56:57 +0100 |
| commit | f134d1730b1f394ff1283f1f44be1deda248e327 (patch) | |
| tree | cdb04611be1326f40db731139f28307b8437db17 | |
| parent | 36ad61299dea617f2a3eea0760e0323857393d2f (diff) | |
| parent | 6b5c720c76cc05d66b8582eec7ba1b283475e2d8 (diff) | |
Merge branch 'FreshRSS/dev' into dev
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | constants.php | 2 | ||||
| -rw-r--r-- | data/shares.php | 2 | ||||
| -rw-r--r-- | p/api/greader.php | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 167c5a29e..2c2d7f4cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2015-xx-xx FreshRSS 1.3.1-beta + +* Nothing for the moment. + ## 2015-11-03 FreshRSS 1.2.0 / 1.3.0-beta * Features diff --git a/constants.php b/constants.php index 1c50d4a83..a501d0df5 100644 --- a/constants.php +++ b/constants.php @@ -1,5 +1,5 @@ <?php -define('FRESHRSS_VERSION', '1.1.4-dev'); +define('FRESHRSS_VERSION', '1.3.1-dev'); define('FRESHRSS_WEBSITE', 'http://freshrss.org'); define('FRESHRSS_WIKI', 'http://doc.freshrss.org'); diff --git a/data/shares.php b/data/shares.php index ed060074e..55ef08ec4 100644 --- a/data/shares.php +++ b/data/shares.php @@ -45,7 +45,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', diff --git a/p/api/greader.php b/p/api/greader.php index b9942f0bc..3fa367299 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -361,6 +361,9 @@ function streamContents($path, $include_target, $start_time, $count, $order, $ex case 'user/-/state/com.google/read': $state = FreshRSS_Entry::STATE_NOT_READ; break; + case 'user/-/state/com.google/unread': + $state = FreshRSS_Entry::STATE_READ; + break; default: $state = FreshRSS_Entry::STATE_ALL; break; |