Commit Graph

11415 Commits

Author SHA1 Message Date
psychobunny
4a3ffec29f proof that comments can be misleading 2013-05-23 15:23:43 -04:00
Baris Usakli
99eb9f8399 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-23 15:17:29 -04:00
Baris Usakli
a4e10076cc assorted 2013-05-23 15:17:18 -04:00
psychobunny
1f99666d9f moved favourites code out of posts 2013-05-23 15:11:55 -04:00
psychobunny
d0646ba98f typo 2013-05-23 14:57:08 -04:00
Julian Lam
bafac00232 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/websockets.js
2013-05-23 14:56:23 -04:00
Julian Lam
35dae6c0ec updating web sockets so that all connections are stored in a userSockets array 2013-05-23 14:55:05 -04:00
Baris Usakli
b0be1fab16 notifications in chat messages 2013-05-23 14:53:50 -04:00
Julian Lam
e159d70353 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/websockets.js
2013-05-23 14:38:53 -04:00
psychobunny
c64b227a9d odd - utils.js 2013-05-23 14:35:20 -04:00
Julian Lam
7e46f8c6ce uniqueId support in notifications 2013-05-23 13:48:42 -04:00
psychobunny
044206ad17 misc cleanup in categories 2013-05-23 13:39:00 -04:00
Julian Lam
681bf270a1 hotfix to path to utils 2013-05-23 13:29:21 -04:00
Julian Lam
1f7ab82f78 Merge remote-tracking branch 'origin' into notifications
Conflicts:
	src/webserver.js
2013-05-23 13:24:27 -04:00
psychobunny
cd4ca110a1 moved utils over to client side for code sharing 2013-05-23 13:21:46 -04:00
Julian Lam
78713f0599 Merge remote-tracking branch 'origin' into notifications 2013-05-23 13:13:35 -04:00
Baris Usakli
acd797fe20 changed github link on home 2013-05-23 13:04:25 -04:00
Julian Lam
ffbafc99c4 Merge remote-tracking branch 'origin' into notifications
Conflicts:
	public/css/style.less
	public/src/app.js
	src/websockets.js
2013-05-23 12:56:55 -04:00
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
40b2aa2a80 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-22 15:35:58 -04:00
Baris Usakli
9f8c9e8822 derp 2013-05-22 15:35:54 -04:00
Julian Lam
6cd65e6598 fixing motd so that it shows default motd if config is empty 2013-05-22 15:15:48 -04:00
Julian Lam
499f840e1e added toggle in config to switch on and off the motd 2013-05-22 12:11:44 -04:00
Julian Lam
16dac16d91 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-05-22 12:06:33 -04:00
Julian Lam
ec463ce3d3 added motd support 2013-05-22 12:06:23 -04:00
Baris Soner Usakli
760037ba0a added signature to new replies 2013-05-21 22:56:09 -04:00
Baris Soner Usakli
ef304a712f strip tags from signature when they are saving, separated info in user profile and added signature box 2013-05-21 22:36:21 -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
Julian Lam
624ccc592c resolving issue where the post window stays open during navigation
- app.close_post_window now neatly closes the post window
2013-05-21 20:20:54 -04:00
Julian Lam
74c13ba299 Merge remote-tracking branch 'origin' 2013-05-21 20:12:28 -04:00
Julian Lam
fd38b60bd6 fixing issue with teasers showing deleted post info 2013-05-21 20:12:13 -04:00
psychobunny
34133eef8c post counts + read status working on homepage category listing. fixed posts.get_cid_by_pid 2013-05-21 18:12:39 -04:00
psychobunny
effb26c856 user friendly message if no topics exist in a category 2013-05-21 17:19:33 -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
Julian Lam
76aa644314 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-05-21 14:54:42 -04:00
Julian Lam
7c165876f1 fixed bug where deleted posts still showed up in teasers 2013-05-21 14:54:35 -04:00
Baris Soner Usakli
9c5fa5fc5e signature work 2013-05-21 13:44:53 -04:00
psychobunny
47d491b266 some left over unfinished templates fixes from last week. deeper urls now take higher precedence. 2013-05-21 10:57:45 -04:00
Julian Lam
7e7d8ac8a4 fixing typo in user.js... weird 2013-05-19 13:39:51 -04:00
Julian Lam
e62fcc5831 refactored the entire privileges stack. .editable() is now deprecated, use
.privileges instead. Privileges now are inherited, so querying a topic's
privileges will automatically query it's parent category's privileges as
well, etc.
2013-05-18 14:59:50 -04:00
Julian Lam
fd5277c815 fixed bug with isAdministator usage in Posts 2013-05-17 21:27:48 -04:00
Julian Lam
1a38644eb8 exposing thread tools to users in the "administrators" set, fixing up
Topics methods to call the "editable" method first instead of just
checking rep thresholds.

Also changed the limit on thread length from 10 to infinity (for now,
until infinite scrolling makes it in)
2013-05-17 21:14:58 -04:00
Julian Lam
7757c29889 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-17 15:34:30 -04:00
Julian Lam
fe9adf696d new post event (although there is a bug... hmhm) 2013-05-17 15:34:25 -04:00
psychobunny
cb6d98cecb derp conflicts
Merge branch 'master' of https://github.com/psychobunny/NodeBB

Conflicts:
	public/src/templates.js
2013-05-17 15:26:46 -04:00