Commit Graph

124 Commits (3e96f641912c6315c7f94c659e67e34cdaa46850)

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
psychobunny 9fb2a338bb whitespace probably oops
psychobunny bcb672e1fe socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled
psychobunny 5e48b4cdc5 redis updates for sets: added sadd, srem, and sismember; finished basic favouriting/up/down votes - still need to add socket support in future
psychobunny c73d1237d2 started favourites/rep
psychobunny 2b50c43a5f Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 7db1834182 gravatars in posts
Julian Lam 430e65a352 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam ba1001aac9 fixed alternative login css
psychobunny 2bc9876852 fixed ready_callback bug
psychobunny d622c9e100 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny edf58693cc added real username to posts
Baris Usakli 7dc9fd83c1 account page shows up when logged in and 403 when logged out
psychobunny b97157d8fd fixed topic name bug
psychobunny e766cc0c64 more style updates to topic + very basic quoting feature in, needs to be looked at in future
Baris Usakli ed26728a0f show username on homepage
psychobunny abf4be488a Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 9fe73d68fc style changes to topics
Julian Lam 00f7347575 css cleanup
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 9c05a76fcb facebook integration
psychobunny c113f4151b Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
	public/css/style.less
	src/webserver.js
psychobunny 517b4de2fe threads look awesome now
Julian Lam 4c41011d83 minor stylistic change to header
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
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 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)