Commit Graph

16126 Commits (a524f9b55ffe6efe027a4c3a610f4053b0d3654e)
 

Author SHA1 Message Date
Julian Lam d4d185ec4f updated readmeh
Julian Lam 531515b8be Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 4833f94808 readme
psychobunny db8140a1b6 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny be954d176d prevent same state from loading again
Julian Lam 2d8725d522 changing socket.io to exist on the same port as the server, made config file template (removed config file from repo)
Julian Lam e6139487f6 Merge branch 'master' of github.com:psychobunny/node-forum
psychobunny 5b64500da3 switch loading of config file to synchronous to prevent socket server from opening pre-emptively
Julian Lam c3daa1ce09 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	public/templates/header.tpl
Julian Lam d035307d8b changing the way the express app is instantiated
psychobunny 1d35f369d9 clean up client side + config.json
Julian Lam 302d1a3131 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam f894eae34f tweaks
psychobunny 65b035c9c9 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 3d81f129e3 added login, fixed gitignore
Julian Lam 6da36bb859 more tweaks to readme
Julian Lam 1d3d3df73b optimizing for express, tweaks to config file
Julian Lam 2980931f1f updated readme
Julian Lam 2cf0a9045a Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
	src/webserver.js
Julian Lam a2d727dd86 setting up config file for use in app, updated readme
psychobunny ccc57b0d71 forgot to add redis.js
psychobunny efa0649081 moved RedisDB.js to src/redis.js
psychobunny f7690896cc cleanu
p
psychobunny 9b973327a0 registration bugfix
psychobunny 415f6c39ed accidentally committed node_modules
psychobunny b04d262fe4 init, just some testing