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
ad2021df04
Merge branch 'master' of https://github.com/psychobunny/node-forum
2013-05-02 16:28:35 -04:00
Baris Usakli
7f12d568ff
user name on home.tpl
2013-05-02 16:28:04 -04:00
Julian Lam
daa01d07d2
Merge branch 'master' of github.com:psychobunny/node-forum
2013-05-02 16:15:53 -04:00
Julian Lam
d5dc81b63c
social icons
2013-05-02 16:15:48 -04:00
psychobunny
9e7654fa9a
template example for user
2013-05-02 20:11:14 +00: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
0929800d96
Merge branch 'master' of github.com:psychobunny/node-forum
...
Conflicts:
src/webserver.js
2013-05-02 15:58:26 -04:00
Julian Lam
9c05a76fcb
facebook integration
2013-05-02 15:57:43 -04:00
psychobunny
5988573d1c
added check for google key
2013-05-02 19:51:28 +00: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
Baris Usakli
6a58622857
Merge branch 'master' of https://github.com/psychobunny/node-forum
2013-05-02 15:45:43 -04: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
4c41011d83
minor stylistic change to header
2013-05-02 14:51:57 -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
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
