Commit Graph

218 Commits

Author SHA1 Message Date
Julian Lam
c8d48127ad more changes to notification dropdown in header bar 2013-05-23 12:54:57 -04:00
psychobunny
9503aa9a57 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-23 12:52:23 -04:00
psychobunny
a9672ab9d8 begin refactor of posts/topics + pagination + cleanup + async 2013-05-23 12:52:16 -04:00
Julian Lam
194793d14d Merge branch 'master' into notifications
Conflicts:
	src/websockets.js
2013-05-23 08:21:36 -04:00
Julian Lam
6bae30336a foundation for user notifications 2013-05-22 21:43:01 -04:00
Baris Usakli
8d0ac4cb07 chat feature 2013-05-22 17:14:06 -04:00
Baris Usakli
9f8c9e8822 derp 2013-05-22 15:35:54 -04:00
Julian Lam
26781157b3 refactoring posts, topics, and categories so that each "get" is moved up
one level. Topics.get will get all of the posts in a tid, etc.
2013-05-21 21:07:26 -04:00
psychobunny
ab492f147f check for online/offline users, added custom redis sismembers method, fix for category view not showing up if it has no topics 2013-05-21 17:02:04 -04:00
psychobunny
e694751b72 fixed templates bug in websockets 2013-05-17 13:40:15 -04:00
Julian Lam
a4dfc604e7 changed favouriting behaviour so that it no longer allows anons to favourite, and favouriting your own posts don't raise your rep count 2013-05-15 13:28:28 -04:00
Baris Usakli
b429a31f6b more clean up 2013-05-14 12:26:26 -04:00
Baris Usakli
4c324664fa removed global modules 2013-05-14 12:13:29 -04:00
Julian Lam
4fd1244e2d some work on deleting posts, and allowing a mod to edit a post 2013-05-11 23:35:27 -04:00
Julian Lam
b244da724e edit labels, and fixing responsive layout in topic view 2013-05-09 20:46:52 -04:00
Julian Lam
e9a552eab4 editing of posts 2013-05-09 10:20:25 -04:00
psychobunny
09c9d0ee1f fixed topics bug that was prevent /latest /popular /active and subsequently the admin versions of those routes from working. removed debug statements. added admin socket room. added dynamic updating of active users on acp index 2013-05-09 04:11:16 +00:00
psychobunny
30323fa29f Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-09 03:33:58 +00:00
psychobunny
f3f08a9c94 more fixes to ajaxify, updated /users blocks to sit flush to the left, started work on the ACP including basic templates, added a method to get active users in all rooms (socket connections), added more routes mostly pointing to admin, added a routing folder to start organizing routes better, starting with admin. 2013-05-09 03:33:53 +00:00
Julian Lam
ff025f0e48 interim commit to thread moving 2013-05-08 14:09:50 -04:00
Baris Usakli
0eacec8166 Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-07 16:21:30 -04:00
Baris Usakli
8fe4905b68 exists function fix 2013-05-07 16:21:25 -04:00
Julian Lam
bf7c602cd8 thread pinning 2013-05-07 15:14:47 -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
Julian Lam
250c70bdfc topic locking and deletion 2013-05-07 12:54:10 -04:00
Baris Usakli
ccf0f6dd73 removed get_username_by_uid, use getUserField(uid,'username',callback) directly 2013-05-07 12:11:22 -04:00
Julian Lam
b2c6d4f7c7 interim commit to thread options 2013-05-07 09:21:46 -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
psychobunny
ecf3ffa170 fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language 2013-05-06 17:09:08 +00:00
psychobunny
1009726b51 almost done X users browsing this thread feature. there is one bug where anonymous users do not get disconnected from the room, so I'll have to figure that out later 2013-05-06 06:07:04 +00: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
54b4c55dfc removed the unused login function 2013-05-05 19:13:08 -04:00
Baris Soner Usakli
fee76db8dc more fixes 2013-05-05 18:40:04 -04:00
Baris Soner Usakli
8a0266562c Merge branch 'master' of https://github.com/psychobunny/NodeBB 2013-05-05 17:38:11 -04:00
Baris Soner Usakli
08f7b64ccf hash changes to user data 2013-05-05 17:38:08 -04:00
psychobunny
26c22b0559 bugfixes + starting active users in thread feature 2013-05-05 20:59:41 +00:00
psychobunny
3947b6b6fd modified ajaxify slightly to make transitions between pages a bit more fluid (although first load doesn't look that awesome); fixed up rooms - resolved DRY failure and properly leave rooms 2013-05-05 20:10:26 +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
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 2013-05-03 18:54:19 +00:00
psychobunny
c73d1237d2 started favourites/rep 2013-05-03 17:52:20 +00:00
Baris Usakli
7f12d568ff user name on home.tpl 2013-05-02 16:28:04 -04:00
Baris Usakli
de28d8af55 token bug 2013-05-02 16:00:24 -04:00
Baris Usakli
44485a2e40 fixed session ids 2013-05-02 15:45:19 -04:00
Baris Usakli
39b24436d0 removed global.socket, passing in socket to the functions now 2013-05-02 12:54:27 -04:00
Julian Lam
69bafcf19c refactoring register to use form post instead of socket (for passport integration) 2013-05-02 10:15:55 -04:00
Julian Lam
a537c4d805 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-01 21:04:05 -04:00
Julian Lam
d712f57141 refactored user authentication (passport-local, instead of my own
half-baked implementation)
2013-05-01 21:03:49 -04:00
psychobunny
e658531a67 replies are up 2013-05-01 20:58:36 +00:00
psychobunny
a655ebb290 most users ever online block 2013-05-01 16:14:09 +00:00
Julian Lam
cb9a110a5d RUN npm install AFTER PULLING THIS COMMIT!
Added user label to header, gravatar support
2013-04-29 12:22:02 -04:00