Merge branch 'dev' into beta

Conflicts:
	README.fr.md
	README.md

1 files changed, 7 insertions, 1 deletions

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 9b6524b01..1be75bb12 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -155,6 +155,9 @@ function mark_read(active, only_not_read) {
 		faviconNbUnread();
 
 		pending_feeds.splice(index_pending, 1);
+	}).fail(function (data) {
+		openNotification(i18n.notif_request_failed, 'bad');
+		pending_feeds.splice(index_pending, 1);
 	});
 }
 
@@ -210,6 +213,9 @@ function mark_favorite(active) {
 		}
 
 		pending_feeds.splice(index_pending, 1);
+	}).fail(function (data) {
+		openNotification(i18n.notif_request_failed, 'bad');
+		pending_feeds.splice(index_pending, 1);
 	});
 }
 
@@ -513,7 +519,7 @@ function init_column_categories() {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
 			var feed_id = $(this).closest('.item').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
-				template = $('#feed_config_template').html().replace(/!!!!!!/g, feed_id).replace('http://example.net/', feed_web);
+				template = $('#feed_config_template').html().replace(/------/g, feed_id).replace('http://example.net/', feed_web);
 			$(this).attr('href', '#dropdown-' + feed_id).prev('.dropdown-target').attr('id', 'dropdown-' + feed_id).parent().append(template);
 		}
 	});