Commit Graph

65 Commits

Author SHA1 Message Date
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
psychobunny
126f817f7d updates to posts 2013-04-28 20:07:42 +00:00
Julian Lam
f4b14df195 some more fixes to the session handling to ignore the /api folder, and
refactoring how the public directory is set up in webserver.js.

THIS COMMIT ALTERS NODEBB'S DEPENDENCIES!
Please run npm install after pulling.
2013-04-28 13:58:19 -04:00
Julian Lam
19cd9e05ed fixing login and logout sessions 2013-04-28 13:28:20 -04:00
psychobunny
7f4ea6e19b Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-04-25 21:55:23 +00:00
psychobunny
98ca14e31c started working on threadss, implemented slug url, fixed crashing bug during post creation 2013-04-25 21:55:11 +00:00
Julian Lam
2a9c33b9f8 user activity counter (bug present where all users register as same session? this isn't good....) 2013-04-25 16:27:22 -04:00
psychobunny
880d6832be Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-04-25 19:13:31 +00:00
psychobunny
5173498180 client side templates in, fixed home page to parse templates on ajaxify, added footer to the page transition animation for smoothness 2013-04-25 19:13:23 +00:00
Julian Lam
81364580ed new 403 page 2013-04-25 14:21:00 -04:00
Julian Lam
f774974803 logout functionality 2013-04-25 12:59:31 -04:00
Julian Lam
8d4fb77565 NEW DEPENDENCY: connect-redis
Persistent sessions with connect-redis.
2013-04-25 11:15:03 -04:00
Julian Lam
eac3785b29 fixing issue with auth (removed session saving stuff by mistake) 2013-04-25 11:04:08 -04:00
Julian Lam
3eb4f0e1a2 commenting out global.uid setting 2013-04-25 00:05:17 -04:00
Julian Lam
9e5a7b96b3 fixed broken mget implementation if no topics are present 2013-04-24 22:20:05 -04:00
psychobunny
a16f72e11c redis - added mget and multi, finished initial topics listview on home page, finished get topics method calls 2013-04-24 22:24:20 +00:00
psychobunny
877219cb58 fixed conflicts 2013-04-24 21:19:04 +00:00
Julian Lam
0985087f5d auth... 2013-04-24 17:14:05 -04:00
Julian Lam
71e410d571 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/webserver.js
2013-04-24 16:44:12 -04:00
Julian Lam
c1186f396e some work on session login etc 2013-04-24 16:42:12 -04:00
psychobunny
d711a4e334 added post button, post window, added click handler to toaster alert, started on posts and topics schema and code 2013-04-24 20:40:34 +00:00
Julian Lam
dea9a707dc interim commit for password reset 2013-04-23 20:25:01 -04:00