Commit Graph

13486 Commits

Author SHA1 Message Date
Julian Lam
32d9b5349e beginning google integration 2013-05-02 12:45:22 -04:00
psychobunny
c73feeea2a hide alternate login strategies if config is not set 2013-05-02 16:36:26 +00:00
Julian Lam
417e722ae7 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-02 12:17:45 -04:00
Julian Lam
60c1e937a1 tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server 2013-05-02 12:13:06 -04:00
Baris Soner Usakli
06d013e6de Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 11:42:10 -04:00
Baris Soner Usakli
a47491225a clear topic and content after post 2013-05-02 11:40:00 -04:00
Julian Lam
5708076137 enabling twitter login 2013-05-02 11:35:15 -04:00
Julian Lam
8e5714cab4 skeleton for twitter integration via passport 2013-05-02 11:11:10 -04:00
Julian Lam
69bafcf19c refactoring register to use form post instead of socket (for passport integration) 2013-05-02 10:15:55 -04:00
Julian Lam
4c80e4f37d minor style changes to header 2013-05-02 09:49:52 -04:00
Julian Lam
09fb79d3a2 integrated LESS middleware to static served CSS/less files 2013-05-02 09:40:44 -04:00
Julian Lam
c7fb07e2e5 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	public/templates/header.tpl
	src/webserver.js
2013-05-02 09:23:11 -04:00
Julian Lam
3ca880d81e interim commit 2013-05-02 09:13:09 -04:00
Julian Lam
de26a303d4 housekeeping 2013-05-01 22:20:30 -04:00
Julian Lam
3ef6cf6cb2 updaring config template 2013-05-01 22:15:07 -04:00
psychobunny
279a0053f1 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 02:04:35 +00:00
psychobunny
f68d9c6635 forgot to update config, derp 2013-05-02 02:04:28 +00:00
Julian Lam
829dae05c5 updating header to show user label when logged in, and register/login when
not
2013-05-01 22:00:49 -04:00
Julian Lam
a537c4d805 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-01 21:04:05 -04:00
Julian Lam
d712f57141 refactored user authentication (passport-local, instead of my own
half-baked implementation)
2013-05-01 21:03:49 -04:00
psychobunny
9119a9d104 small refactor of routing, cleanup, templates are now parsed entirely on client side for /, /register, /login for now 2013-05-01 22:19:54 +00:00
psychobunny
1bec9fc5aa breadcrumbs, and changed home in nav to 'forum' 2013-05-01 21:52:40 +00:00
psychobunny
b2bc967e9b got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls 2013-05-01 21:26:47 +00:00
psychobunny
6471109a25 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-01 20:58:39 +00:00
psychobunny
e658531a67 replies are up 2013-05-01 20:58:36 +00:00
Julian Lam
70d3105a8e configuring express session to use a secret defined in the config file,
not a hard coded one
2013-05-01 16:27:57 -04:00
psychobunny
a7f4c16140 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-01 18:30:30 +00:00
Julian Lam
924618fc29 removed account_settings template 2013-05-01 14:29:49 -04:00
psychobunny
1f97fefac0 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-01 18:25:29 +00:00
psychobunny
0f3f2bb859 post replies, unfinished 2013-05-01 18:25:24 +00:00
Julian Lam
1f91a5198d removing utils.js... fucking git 2013-05-01 14:24:39 -04:00
Julian Lam
62779ef0dd relative time on topics and posts 2013-05-01 14:23:57 -04:00
psychobunny
f8345a1223 added timestamp to record users 2013-05-01 18:01:02 +00:00
psychobunny
b762ec275e Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-01 17:01:12 +00:00
psychobunny
ab456e07af fixes to template parser: hide block if no data exists (prevents the default tpl skeleton from showing up) 2013-05-01 17:01:05 +00:00
Julian Lam
b93c003251 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-01 12:54:16 -04:00
Julian Lam
c298e7002e updated configuration file with redis params, and updated all redis wrapper to read configs from config file instead of defaulting to localhost -- same for express.session store 2013-05-01 12:54:04 -04:00
psychobunny
a655ebb290 most users ever online block 2013-05-01 16:14:09 +00:00
psychobunny
bb8d5098e4 fixed bottom border on last topicrow 2013-05-01 15:44:54 +00:00
psychobunny
93d7f8d52c hide latest user block if doesn't exist 2013-05-01 15:41:01 +00:00
Baris Soner Usakli
20aa5d439e log server errors in browser
added uid to posts
2013-04-30 12:40:16 -04:00
Julian Lam
a6cbed94fc changing some niggling CSS to turn on bootstrap-responsive 2013-04-29 22:23:40 -04:00
Julian Lam
cb9a110a5d RUN npm install AFTER PULLING THIS COMMIT!
Added user label to header, gravatar support
2013-04-29 12:22:02 -04:00
Julian Lam
4730bc0f6f updated README to reflect proper installation commands 2013-04-29 11:10:09 -04:00
Baris Soner Usakli
1fb99ab848 fixed the crash when going between pages, return next() in webserver.js 2013-04-28 22:26:27 -04:00
Julian Lam
58642b1e7b removed requireAuth middleware 2013-04-28 21:15:47 -04:00
Julian Lam
2358528880 merging changes for stash pop 2013-04-28 21:11:39 -04:00
psychobunny
19a63bf51b fix for threads that have 0 posts 2013-04-28 20:27:10 +00:00
psychobunny
1037088643 commented out breaking code regarding user var 2013-04-28 20:16:22 +00:00
psychobunny
303452ef8c fixed conflicts 2013-04-28 20:10:11 +00:00