Commit Graph

23360 Commits (df8c8ad8e4fa3ed18a99b8715c39131ca01a28c0)
 

Author SHA1 Message Date
psychobunny abf4be488a Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 9fe73d68fc style changes to topics
Julian Lam 00f7347575 css cleanup
Julian Lam 6d36df1604 tweaking users/* calls
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.
Baris Usakli ad2021df04 Merge branch 'master' of https://github.com/psychobunny/node-forum
Baris Usakli 7f12d568ff user name on home.tpl
Julian Lam daa01d07d2 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam d5dc81b63c social icons
psychobunny 9e7654fa9a template example for user
Baris Usakli bff02a7f2e Merge branch 'master' of https://github.com/psychobunny/node-forum
Baris Usakli de28d8af55 token bug
Julian Lam 0929800d96 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/webserver.js
Julian Lam 9c05a76fcb facebook integration
psychobunny 5988573d1c added check for google key
psychobunny c113f4151b Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
	public/css/style.less
	src/webserver.js
Baris Usakli 6a58622857 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 517b4de2fe threads look awesome now
Baris Usakli 44485a2e40 fixed session ids
Julian Lam 4c41011d83 minor stylistic change to header
Julian Lam bef0bd87da Merge branch 'master' of github.com:psychobunny/node-forum
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
Baris Usakli 8cedb33c82 Merge branch 'master' of https://github.com/psychobunny/node-forum
Baris Usakli 39b24436d0 removed global.socket, passing in socket to the functions now
Julian Lam 32d9b5349e beginning google integration
psychobunny c73feeea2a hide alternate login strategies if config is not set
Julian Lam 417e722ae7 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 60c1e937a1 tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server
Baris Soner Usakli 06d013e6de Merge branch 'master' of https://github.com/psychobunny/node-forum
Baris Soner Usakli a47491225a clear topic and content after post
Julian Lam 5708076137 enabling twitter login
Julian Lam 8e5714cab4 skeleton for twitter integration via passport
Julian Lam 69bafcf19c refactoring register to use form post instead of socket (for passport integration)
Julian Lam 4c80e4f37d minor style changes to header
Julian Lam 09fb79d3a2 integrated LESS middleware to static served CSS/less files
Julian Lam c7fb07e2e5 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	public/templates/header.tpl
	src/webserver.js
Julian Lam 3ca880d81e interim commit
Julian Lam de26a303d4 housekeeping
Julian Lam 3ef6cf6cb2 updaring config template
psychobunny 279a0053f1 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny f68d9c6635 forgot to update config, derp
Julian Lam 829dae05c5 updating header to show user label when logged in, and register/login when
not
Julian Lam a537c4d805 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam d712f57141 refactored user authentication (passport-local, instead of my own
half-baked implementation)
psychobunny 9119a9d104 small refactor of routing, cleanup, templates are now parsed entirely on client side for /, /register, /login for now
psychobunny 1bec9fc5aa breadcrumbs, and changed home in nav to 'forum'
psychobunny b2bc967e9b got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls
psychobunny 6471109a25 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny e658531a67 replies are up
Julian Lam 70d3105a8e configuring express session to use a secret defined in the config file,
not a hard coded one