Commit Graph

12 Commits (ed26728a0f7b18525da3ce4e6174f66cbbb65a1c)

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 d5dc81b63c social icons
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 5708076137 enabling twitter login
Julian Lam 09fb79d3a2 integrated LESS middleware to static served CSS/less files