From 94d874c0b2b5e719af3aa676d015307bab514b6a Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sat, 1 Feb 2014 11:55:36 +0000
Subject: Doc - Make TOS include work.

---
 doc/TermsOfService.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/TermsOfService.md b/doc/TermsOfService.md
index 3586b5d82..41e9c0de7 100644
--- a/doc/TermsOfService.md
+++ b/doc/TermsOfService.md
@@ -1,4 +1,4 @@
 Terms of Service
 ================
 
-#include SiteTOS;
+#include doc/SiteTOS.md;
-- 
cgit v1.2.3


From 30aeb42bed0b4bb6bf90c16674565ee5d7a26945 Mon Sep 17 00:00:00 2001
From: Christian Vogeley <christian.vogeley@hotmail.de>
Date: Sat, 1 Feb 2014 23:28:27 +0100
Subject: Press return to post chat posts- SHIFT-RETURN creates line break

on mobile devices keep default behavior
---
 view/tpl/chat.tpl | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 0ebe879a1..a0c18f8d6 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -89,3 +89,20 @@ function update_chats(chats) {
 }
 
 </script>
+<script>
+function isMobile() {
+  try{ document.createEvent("TouchEvent"); return true; }
+  catch(e){ return false; }
+}
+$(function(){
+
+  $('#chatText').keypress(function(e){
+  	if (e.keyCode == 13 && e.shiftKey||isMobile()) {
+	}
+    else if (e.keyCode == 13) {
+	  e.preventDefault();
+      $(this).parent('form').trigger('submit');
+    }
+  });
+});
+</script>
-- 
cgit v1.2.3