From 775dc3a320455e24cfc3773d7044596fad66b9ab Mon Sep 17 00:00:00 2001
From: RedSwede <redswede@riseup.net>
Date: Thu, 29 Jan 2015 14:56:31 +0100
Subject: [PATCH 1/5] Renamed translation file

---
 doc/sv/{roles.bb => roles.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename doc/sv/{roles.bb => roles.md} (100%)

diff --git a/doc/sv/roles.bb b/doc/sv/roles.md
similarity index 100%
rename from doc/sv/roles.bb
rename to doc/sv/roles.md

From bee939d79ad625a68acdd27954bdf0296eadc959 Mon Sep 17 00:00:00 2001
From: RedSwede <redswede@riseup.net>
Date: Thu, 29 Jan 2015 16:06:39 +0100
Subject: [PATCH 2/5] fix issue 848 + code comments

---
 mod/tagger.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mod/tagger.php b/mod/tagger.php
index a93609c3c..aafad58cf 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -12,11 +12,9 @@ function tagger_content(&$a) {
 	}
 
 	$observer_hash = get_observer_hash();
-
+	//strip html-tags
 	$term = notags(trim($_GET['term']));
-	// no commas allowed
-	$term = str_replace(array(',',' '),array('','_'),$term);
-
+	//check if empty
 	if(! $term)
 		return;
 

From 06291c6f4274b32dbc3b3e6ef01c80a8775f3094 Mon Sep 17 00:00:00 2001
From: RedSwede <redswede@riseup.net>
Date: Thu, 29 Jan 2015 16:22:14 +0100
Subject: [PATCH 3/5] non-tested fix for issue 847

---
 view/tpl/event_form.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index a4717415e..2479068f3 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -41,7 +41,7 @@
 
 {{if $catsenabled}}
 <div id="event-category-wrap">
-	<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" />
+	<input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" data-role="tagsinput"  />
 </div>
 {{/if}}
 

From 05ce141ecc13d2af754b1e055b1856e73a65d7dd Mon Sep 17 00:00:00 2001
From: RedSwede <redswede@riseup.net>
Date: Thu, 29 Jan 2015 16:30:45 +0100
Subject: [PATCH 4/5] small autocomplete fix adding space to the output
 provides: the ability to press enter after pressing enter during the
 mention-js-popup (this second enter should behave as a normal one) FF35

---
 view/js/autocomplete.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 86847cb35..b93cc16b3 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -77,7 +77,7 @@ function editor_replace(item) {
 	// 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id).
 	if(id.length > 16) 
 		id = item.id.substring(0,16);
-	return '$1$2'+item.nick.replace(' ','') + '+' + id;
+	return '$1$2'+item.nick.replace(' ','') + '+' + id + ' ';
 }
 
 function basic_replace(item) {

From e2edc2c96841588ade355890c49ff7a3c900078d Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 29 Jan 2015 15:17:50 -0800
Subject: [PATCH 5/5] disable ratings until we're a bit further along. It's all
 changing.

---
 mod/connedit.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/connedit.php b/mod/connedit.php
index c082e03a8..da0ab2b6c 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -528,6 +528,7 @@ function connedit_content(&$a) {
 		}
 
 		$poco_rating = get_config('system','poco_rating_enable');
+		$poco_rating = 0; // leave disabled until we're ready for it. 
 		// if unset default to enabled
 		if($poco_rating === false)
 			$poco_rating = true;