Commit Graph

8605 Commits

Author SHA1 Message Date
Baris Usakli
7dc9fd83c1 account page shows up when logged in and 403 when logged out 2013-05-03 12:27:07 -04:00
psychobunny
e766cc0c64 more style updates to topic + very basic quoting feature in, needs to be looked at in future 2013-05-03 16:22:40 +00:00
Baris Usakli
ed26728a0f show username on homepage 2013-05-03 11:43:01 -04:00
Julian Lam
6d36df1604 tweaking users/* calls 2013-05-02 20:45:45 -04:00
Julian Lam
0ae4e31163 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.
2013-05-02 20:35:42 -04:00
Baris Usakli
7f12d568ff user name on home.tpl 2013-05-02 16:28:04 -04:00
Baris Usakli
bff02a7f2e Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 16:00:45 -04:00
Baris Usakli
de28d8af55 token bug 2013-05-02 16:00:24 -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
Baris Usakli
44485a2e40 fixed session ids 2013-05-02 15:45:19 -04:00
Julian Lam
bef0bd87da Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-02 14:47:22 -04: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
Baris Usakli
8cedb33c82 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 12:56:17 -04:00
Baris Usakli
39b24436d0 removed global.socket, passing in socket to the functions now 2013-05-02 12:54:27 -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
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
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
Baris Soner Usakli
20aa5d439e log server errors in browser
added uid to posts
2013-04-30 12:40:16 -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
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