Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

3 files changed, 13 insertions, 7 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9e06fb7a1..53d8a0f2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
-Hubzilla 1.14RC (2016-10-02)
+Hubzilla 1.14 (2016-10-13)
+	- New hook bbcode_filter
 	- Unify the various mail sending instance to enotify::send() and z_mail()
 	- Provide ability for admin to change account password
 	- Replace deprecated Sabre functions
@@ -38,6 +39,9 @@ Hubzilla 1.14RC (2016-10-02)
 	- Server roles (basic, standard and pro)
 
 	Bugfixes
+	- Fix connected time not shown on ajax loaded connections
+	- API issues
+	- Fix readmore.js collapsing on scrolldirection change in some mobile browsers
 	- Personalize Server Emails
 	- Audio player doesn't automatically show for m4a files
 	- Fix ajax page update with /channel?f=&mid=hash
@@ -65,6 +69,7 @@ Hubzilla 1.14RC (2016-10-02)
 	- Public forum check with custom/expert permissions
 
 	Plugins
+	- Standard Embed: update to convert old corporate bbcodes
 	- Cdav security: fix rw permission check
 	- Cdav: add partial support for recurring events in the browser client (editing/creating is not implemented)
 	- New plugin phpmailer: use phpmailer class instead of php's built-in mail() function
diff --git a/view/js/main.js b/view/js/main.js
index 0239fc1f8..5435dfd87 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -854,6 +854,7 @@ function pageUpdate() {
 		scroll_next = false;
 		updatePageItems(update_mode,data);
 		$("#page-spinner").spin(false);
+		$(".autotime").timeago();
 		in_progress = false;
 	});
 }
diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index 112204a5a..68add4eed 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -4,13 +4,13 @@ $(document).ready(function() {
 }); 
 
 $("#contacts-search").keyup(function(event){
-		if(event.keyCode == 13){
-			$("#contacts-search").click();
-		}
+	if(event.keyCode == 13){
+		$("#contacts-search").click();
+	}
 });
 $(".autocomplete-w1 .selected").keyup(function(event){
-		if(event.keyCode == 13){
-			$("#contacts-search").click();
-		}
+	if(event.keyCode == 13){
+		$("#contacts-search").click();
+	}
 });