From 0ae4e311637e4be5f3d021cc0eee36b8fba9c16b Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Thu, 2 May 2013 20:35:42 -0400
Subject: [PATCH 1/3] RUN "npm install" AFTER THIS GIT PULL!!

Integrated markdown parsing to all post content. Title content by default
not going to be parsed, using default options unless circumstances dictate
otherwise.
---
 package.json  | 3 ++-
 src/posts.js  | 5 +++--
 src/topics.js | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index bc67486e6b..422246b90b 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,8 @@
       "passport-twitter": "0.1.4",
       "passport-google-oauth": "0.1.5",
       "passport-facebook": "0.1.5",
-      "less-middleware": "0.1.11"
+      "less-middleware": "0.1.11",
+      "marked": "0.2.8"
     },
   "devDependencies": {},
   "optionalDependencies": {},
diff --git a/src/posts.js b/src/posts.js
index 35fdaa30a1..e66cd534e9 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -1,5 +1,6 @@
 var	RDB = require('./redis.js'),
-	utils = require('./utils.js');
+	utils = require('./utils.js'),
+	marked = require('marked');
 
 (function(Posts) {
 	//data structure
@@ -41,7 +42,7 @@ var	RDB = require('./redis.js'),
 							var posts = [];
 							for (var i=0, ii=content.length; i<ii; i++) {
 								posts.push({
-									'content' : content[i],
+									'content' : marked(content[i]),
 									'uid' : uid[i],
 									'timestamp' : timestamp[i],
 									'relativeTime': utils.relativeTime(timestamp[i])
diff --git a/src/topics.js b/src/topics.js
index ba8da84519..6f92688c0e 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -26,7 +26,7 @@ var	RDB = require('./redis.js'),
 		posts.get(function(data) {
 			topic_body = topic_body.parse(data);
 			callback(topic_body);
-		}, tid, start, end)
+		}, tid, start, end);
 	};
 
 	// this needs to move into forum.js

From 6d36df1604f076ae5ba31f1020df562908808a2c Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Thu, 2 May 2013 20:45:45 -0400
Subject: [PATCH 2/3] tweaking users/* calls

---
 src/webserver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webserver.js b/src/webserver.js
index 81ae0a36bf..b9941dfd58 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -270,7 +270,7 @@ passport.deserializeUser(function(uid, done) {
 
 	app.get('/users/:username', function(req, res) {
 		global.modules.user.get_uid_by_username(req.params.username, function(uid) {
-			res.send(templates['header'] + templates['user_profile'].parse({ uid: uid }) + templates['footer']);
+			res.send('User profile for uid: ' + uid);
 		});
 	});
 }(WebServer));

From 00f73475751c0bd9db7b6264163c9fe2152a1cad Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Thu, 2 May 2013 20:56:18 -0400
Subject: [PATCH 3/3] css cleanup

---
 public/css/style.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/css/style.less b/public/css/style.less
index 4b3a528a3b..62acb53e10 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -24,7 +24,7 @@ body {
 }
 
 .none {
-	display: none;
+	display: none !important;
 }
 
 .block {