Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	public/routes/msgCard.js

public/routes/home.js

@@ -26,25 +26,22 @@ const HomeRouter = {
             messages();
         },
 		goBackToDashboard: function() {
-			//Home neu rendern ...
-			//windows.history.go();
-			router.push('/files')
-			router.push('/home')
+			vueForceRender();
 			$("#escape-search-link").css("visibility", "hidden");
 			$("#subscribe-btn").css("visibility", "hidden");
 		},
 		changeSubscribtion: function(){
 			var btnString = $("#btn-text").text();
-			//console.log(btnString);
+			console.log(btnString);
 
 			if($("#btn-text").hasClass("subscribed")){
 				$("#btn-text").removeClass("subscribed");
-				var newBtnString = "#" + $("#btn-text").text(/deabonnieren/g, '') + "abonnieren";
+				var newBtnString = btnString.replace(/deabonnieren/g, '') + "abonnieren";
 				//console.log(btnString);
 				$("#btn-text").text(newBtnString);
 			}else{
 				$("#btn-text").addClass("subscribed");
-				var newBtnString = "#" + $("#btn-text").text(/abonnieren/g, '') + "deabonnieren";
+				var newBtnString = btnString.replace(/abonnieren/g, '') + "deabonnieren";
 				//console.log(newBtnString);
 				$("#btn-text").text(newBtnString);
 

public/routes/msgCard.js

@@ -68,7 +68,9 @@ Vue.component('MsgCard', {
             }*/
         },
         filterForTag: function (tag) {
-
+			var btnString = "#" + tag + " abonnieren";
+			$("#btn-text").text(btnString);
+			$("#subscribe-btn").css("visibility", "visible");
             //console.log("link: " + tag);
             searching(tag);
             var btnString = "#" + tag + " abonnieren";