Merged main & websocket server, refactored libs, image uploads fixes

2016-10-16 01:34:34 -04:00
parent 6ea243e8d4
commit 91d524eb06
29 changed files with 350 additions and 3985 deletions
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -25,7 +25,7 @@ html
 		script(type='text/javascript', src='/js/libs.js')
 		script(type='text/javascript', src='/js/app.js')
 		script(type='text/javascript').
-			var ioHost = window.location.origin + ':!{appconfig.wsPort}/';
+			var ioHost = window.location.origin + ':!{appconfig.port}/';

 		block head