psychobunny
|
6dfc44c63c
|
Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
src/webserver.js
|
12 years ago |
|
psychobunny
|
5153aa7652
|
added template mapping, did users->account
|
12 years ago |
Baris Usakli
|
49cb5fddcd
|
removed some console.log
|
12 years ago |
|
Baris Usakli
|
ec754d601d
|
users profile page, need to add templates
|
12 years ago |
|
psychobunny
|
fa64e84dcc
|
fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies
|
12 years ago |
Julian Lam
|
4f38bb10e8
|
Merge remote-tracking branch 'origin'
|
12 years ago |
|
Julian Lam
|
b6f3211ce7
|
if a thread is locked, the reply buttons all now say "locked", and the
post reply window will not pop up
|
12 years ago |
|
Baris Soner Usakli
|
da837f662a
|
redirect /login and /register to /account if user is already logged in
|
12 years ago |
|
Julian Lam
|
30bf27f1c7
|
Merge remote-tracking branch 'origin' into posts-refactor
|
12 years ago |
|
Julian Lam
|
08c303b3c7
|
interim commit
|
12 years ago |
|
psychobunny
|
8a2c18de5b
|
fixed ajaxify bug that was rendering pages twice (solved flicker issue); fixed entering rooms that was casuing rep/streaming posts to not work; fixed /accounts to work by adding get data route; fixed bug that preventing gravatars from loading if there was more than one post in the thread
|
12 years ago |
|
Baris Soner Usakli
|
c906b7419a
|
added reputation to /account
|
12 years ago |
|
Baris Soner Usakli
|
fee76db8dc
|
more fixes
|
12 years ago |
|
Baris Soner Usakli
|
954392e4c4
|
fixes to gravatars and get functions in user.js
|
12 years ago |
|
Baris Soner Usakli
|
08f7b64ccf
|
hash changes to user data
|
12 years ago |
|
Julian Lam
|
1fc6e0db2c
|
added email verification on registration
added email header and footer
|
12 years ago |
|
Baris Soner Usakli
|
73e958e627
|
added join date to users, fixed post count when a new topic is created. account page shows time joined,picture and name
|
12 years ago |
|
psychobunny
|
69565b0ded
|
fixed a bug where anonymous users couldnt access topics
|
12 years ago |
|
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
|
12 years ago |
|
psychobunny
|
bcb672e1fe
|
socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled
|
12 years ago |
|
Baris Usakli
|
7dc9fd83c1
|
account page shows up when logged in and 403 when logged out
|
12 years ago |
|
Julian Lam
|
6d36df1604
|
tweaking users/* calls
|
12 years ago |
Julian Lam
|
9c05a76fcb
|
facebook integration
|
12 years ago |
|
psychobunny
|
c113f4151b
|
Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
public/css/style.less
src/webserver.js
|
12 years ago |
|
psychobunny
|
517b4de2fe
|
threads look awesome now
|
12 years ago |
|
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
|
12 years ago |
|
Julian Lam
|
32d9b5349e
|
beginning google integration
|
12 years ago |
|
psychobunny
|
c73feeea2a
|
hide alternate login strategies if config is not set
|
12 years ago |
|
Julian Lam
|
60c1e937a1
|
tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server
|
12 years ago |
|
Julian Lam
|
8e5714cab4
|
skeleton for twitter integration via passport
|
12 years ago |
|
Julian Lam
|
69bafcf19c
|
refactoring register to use form post instead of socket (for passport integration)
|
12 years ago |
|
Julian Lam
|
09fb79d3a2
|
integrated LESS middleware to static served CSS/less files
|
12 years ago |
|
Julian Lam
|
c7fb07e2e5
|
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
public/templates/header.tpl
src/webserver.js
|
12 years ago |
|
Julian Lam
|
3ca880d81e
|
interim commit
|
12 years ago |
|
Julian Lam
|
de26a303d4
|
housekeeping
|
12 years ago |
|
Julian Lam
|
a537c4d805
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
12 years ago |
|
Julian Lam
|
d712f57141
|
refactored user authentication (passport-local, instead of my own
half-baked implementation)
|
12 years ago |
|
psychobunny
|
9119a9d104
|
small refactor of routing, cleanup, templates are now parsed entirely on client side for /, /register, /login for now
|
12 years ago |
|
psychobunny
|
b2bc967e9b
|
got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls
|
12 years ago |
|
Julian Lam
|
70d3105a8e
|
configuring express session to use a secret defined in the config file,
not a hard coded one
|
12 years ago |
|
Julian Lam
|
924618fc29
|
removed account_settings template
|
12 years ago |
|
Julian Lam
|
c298e7002e
|
updated configuration file with redis params, and updated all redis wrapper to read configs from config file instead of defaulting to localhost -- same for express.session store
|
12 years ago |
|
Baris Soner Usakli
|
1fb99ab848
|
fixed the crash when going between pages, return next() in webserver.js
|
12 years ago |
|
Julian Lam
|
58642b1e7b
|
removed requireAuth middleware
|
12 years ago |
|
Julian Lam
|
2358528880
|
merging changes for stash pop
|
12 years ago |
|
psychobunny
|
1037088643
|
commented out breaking code regarding user var
|
12 years ago |
|
psychobunny
|
303452ef8c
|
fixed conflicts
|
12 years ago |
|
psychobunny
|
126f817f7d
|
updates to posts
|
12 years ago |
|
Julian Lam
|
f4b14df195
|
some more fixes to the session handling to ignore the /api folder, and
refactoring how the public directory is set up in webserver.js.
THIS COMMIT ALTERS NODEBB'S DEPENDENCIES!
Please run npm install after pulling.
|
12 years ago |
|
Julian Lam
|
19cd9e05ed
|
fixing login and logout sessions
|
12 years ago |