Commit Graph

105 Commits

Author SHA1 Message Date
Baris Usakli
187d5a101a edit page 2013-05-08 12:51:37 -04:00
Baris Usakli
36e7baa84d userS 2013-05-08 11:48:21 -04:00
Baris Usakli
5e36ca2fbe removed dupe function 2013-05-08 11:10:16 -04:00
Baris Usakli
d308242d2d decimal places for rep and post count 2013-05-08 11:08:56 -04:00
Baris Soner Usakli
6dda6ce15b removed some console.logs 2013-05-07 20:12:48 -04:00
Baris Soner Usakli
8710aa3457 users page 2013-05-07 19:18:13 -04:00
psychobunny
e061fe061b added custom routing from server side, started moving hardcoded scripts into create_route 2013-05-07 21:29:28 +00:00
psychobunny
e75076caad Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 21:17:25 +00:00
psychobunny
09c6aace09 custom template half in 2013-05-07 21:17:22 +00:00
Baris Usakli
781d7cf9cf template stuff 2013-05-07 17:16:57 -04:00
Baris Usakli
bf731dc224 user edit 2013-05-07 16:49:18 -04:00
Baris Usakli
cef1ba4c08 changed profile page to /users/username 2013-05-07 16:35:29 -04:00
Baris Usakli
0eacec8166 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 16:21:30 -04:00
psychobunny
91d9775cc4 fixed slugs from disappearing if f5ing 2013-05-07 19:22:38 +00:00
Baris Usakli
283dbc477b Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 13:55:05 -04:00
Baris Usakli
6a6eeae426 edit changes 2013-05-07 13:55:02 -04:00
Julian Lam
7bbc630dfb Merge remote-tracking branch 'origin' into thread_options
Conflicts:
	public/src/templates.js
2013-05-07 12:56:21 -04:00
psychobunny
ace64cec7b Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 16:52:41 +00:00
psychobunny
31542cd9be finished recent, popular and active posts shells, just need to update api methods 2013-05-07 16:52:35 +00:00
Baris Usakli
ec104b05d4 added links to user profiles from posts and the breadcrumbs 2013-05-07 12:47:12 -04:00
psychobunny
6dfc44c63c Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/webserver.js
2013-05-07 16:14:22 +00:00
psychobunny
5153aa7652 added template mapping, did users->account 2013-05-07 16:12:26 +00:00
Baris Usakli
49cb5fddcd removed some console.log 2013-05-07 11:53:40 -04:00
Baris Usakli
ec754d601d users profile page, need to add templates 2013-05-07 10:56:30 -04:00
Julian Lam
b2c6d4f7c7 interim commit to thread options 2013-05-07 09:21:46 -04:00
Julian Lam
d7c5a3c150 merging from stash 2013-05-06 21:15:53 -04:00
psychobunny
fa64e84dcc fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies 2013-05-06 22:05:42 +00:00
Julian Lam
4f38bb10e8 Merge remote-tracking branch 'origin' 2013-05-06 15:31:32 -04:00
Julian Lam
b6f3211ce7 if a thread is locked, the reply buttons all now say "locked", and the
post reply window will not pop up
2013-05-06 15:09:22 -04:00
Baris Soner Usakli
da837f662a redirect /login and /register to /account if user is already logged in 2013-05-06 14:27:15 -04:00
Julian Lam
30bf27f1c7 Merge remote-tracking branch 'origin' into posts-refactor 2013-05-06 10:05:10 -04:00
Julian Lam
08c303b3c7 interim commit 2013-05-06 10:05:00 -04:00
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 2013-05-06 03:41:22 +00:00
Baris Soner Usakli
c906b7419a added reputation to /account 2013-05-05 19:35:17 -04:00
Baris Soner Usakli
fee76db8dc more fixes 2013-05-05 18:40:04 -04:00
Baris Soner Usakli
954392e4c4 fixes to gravatars and get functions in user.js 2013-05-05 18:07:54 -04:00
Baris Soner Usakli
08f7b64ccf hash changes to user data 2013-05-05 17:38:08 -04:00
Julian Lam
1fc6e0db2c added email verification on registration
added email header and footer
2013-05-05 13:05:05 -04:00
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 2013-05-04 18:20:22 -04:00
psychobunny
69565b0ded fixed a bug where anonymous users couldnt access topics 2013-05-04 06:01:06 +00:00
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 2013-05-03 21:19:28 +00:00
psychobunny
bcb672e1fe socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled 2013-05-03 19:31:21 +00:00
Baris Usakli
7dc9fd83c1 account page shows up when logged in and 403 when logged out 2013-05-03 12:27:07 -04:00
Julian Lam
6d36df1604 tweaking users/* calls 2013-05-02 20:45:45 -04:00
Julian Lam
9c05a76fcb facebook integration 2013-05-02 15:57:43 -04:00
psychobunny
c113f4151b Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
	public/css/style.less
	src/webserver.js
2013-05-02 19:48:14 +00:00
psychobunny
517b4de2fe threads look awesome now 2013-05-02 19:45:22 +00:00
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
2013-05-02 14:47:00 -04:00
Julian Lam
32d9b5349e beginning google integration 2013-05-02 12:45:22 -04:00
psychobunny
c73feeea2a hide alternate login strategies if config is not set 2013-05-02 16:36:26 +00:00