Commit Graph

22428 Commits (5e6b8433a3908f15a35fa0cb77ec46ae4780da74)
 

Author SHA1 Message Date
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 b5622690e0 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny c73d1237d2 started favourites/rep
Baris Usakli 2a3ef2408f fixed post content
psychobunny 2b50c43a5f Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 7db1834182 gravatars in posts
Baris Usakli 3c86b43ba3 post count is incrementing when replying
Julian Lam 430e65a352 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam bceaf67c20 INSTALL build-essential AND RUN npm install!!!!
bcrypt integration
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
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