86 Commits

Author	SHA1	Message	Date
psychobunny	ace64cec7b	Merge branch 'master' of https://github.com/psychobunny/NodeBB	2013-05-07 16:52:41 +00:00
psychobunny	31542cd9be	finished recent, popular and active posts shells, just need to update api methods	2013-05-07 16:52:35 +00:00
Baris Usakli	ec104b05d4	added links to user profiles from posts and the breadcrumbs	2013-05-07 12:47:12 -04:00
psychobunny	6dfc44c63c	Merge branch 'master' of https://github.com/psychobunny/NodeBB ... Conflicts: src/webserver.js	2013-05-07 16:14:22 +00:00
psychobunny	5153aa7652	added template mapping, did users->account	2013-05-07 16:12:26 +00:00
Baris Usakli	49cb5fddcd	removed some console.log	2013-05-07 11:53:40 -04:00
Baris Usakli	ec754d601d	users profile page, need to add templates	2013-05-07 10:56:30 -04:00
psychobunny	fa64e84dcc	fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies	2013-05-06 22:05:42 +00:00
Julian Lam	4f38bb10e8	Merge remote-tracking branch 'origin'	2013-05-06 15:31:32 -04:00
Julian Lam	b6f3211ce7	if a thread is locked, the reply buttons all now say "locked", and the ... post reply window will not pop up	2013-05-06 15:09:22 -04:00
Baris Soner Usakli	da837f662a	redirect /login and /register to /account if user is already logged in	2013-05-06 14:27:15 -04:00
Julian Lam	30bf27f1c7	Merge remote-tracking branch 'origin' into posts-refactor	2013-05-06 10:05:10 -04:00
Julian Lam	08c303b3c7	interim commit	2013-05-06 10:05:00 -04:00
psychobunny	8a2c18de5b	fixed ajaxify bug that was rendering pages twice (solved flicker issue); fixed entering rooms that was casuing rep/streaming posts to not work; fixed /accounts to work by adding get data route; fixed bug that preventing gravatars from loading if there was more than one post in the thread	2013-05-06 03:41:22 +00:00
Baris Soner Usakli	c906b7419a	added reputation to /account	2013-05-05 19:35:17 -04:00
Baris Soner Usakli	fee76db8dc	more fixes	2013-05-05 18:40:04 -04:00
Baris Soner Usakli	954392e4c4	fixes to gravatars and get functions in user.js	2013-05-05 18:07:54 -04:00
Baris Soner Usakli	08f7b64ccf	hash changes to user data	2013-05-05 17:38:08 -04:00
Julian Lam	1fc6e0db2c	added email verification on registration ... added email header and footer	2013-05-05 13:05:05 -04:00
Baris Soner Usakli	73e958e627	added join date to users, fixed post count when a new topic is created. account page shows time joined,picture and name	2013-05-04 18:20:22 -04:00
psychobunny	69565b0ded	fixed a bug where anonymous users couldnt access topics	2013-05-04 06:01:06 +00:00
psychobunny	3e96f64191	streaming posts. also moved topics to be entirely client side parsed. made some changes. added block level caching to templates. added a prepare method to templates	2013-05-03 21:19:28 +00:00
psychobunny	bcb672e1fe	socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled	2013-05-03 19:31:21 +00:00
Baris Usakli	7dc9fd83c1	account page shows up when logged in and 403 when logged out	2013-05-03 12:27:07 -04:00
Julian Lam	6d36df1604	tweaking users/* calls	2013-05-02 20:45:45 -04:00
Julian Lam	9c05a76fcb	facebook integration	2013-05-02 15:57:43 -04:00
psychobunny	c113f4151b	Merge branch 'master' of https://github.com/psychobunny/node-forum ... Conflicts: public/css/style.less src/webserver.js	2013-05-02 19:48:14 +00:00
psychobunny	517b4de2fe	threads look awesome now	2013-05-02 19:45:22 +00:00
Julian Lam	8be3b8c05e	accidentally developed on a merge commit... *fingers crossed* ... Merge branch 'master' of github.com:psychobunny/node-forum Conflicts: public/templates/login.tpl	2013-05-02 14:47:00 -04:00
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	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
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	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	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	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
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
Julian Lam	924618fc29	removed account_settings template	2013-05-01 14:29:49 -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
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	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