Merge branch 'FreshRSS/dev' into dev

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

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');
 

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',

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;