Commit Graph

717 Commits

Author SHA1 Message Date
Baris Usakli
b0be1fab16 notifications in chat messages 2013-05-23 14:53:50 -04:00
Julian Lam
cf64952918 bugfixing notif window 2013-05-23 14:43:00 -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
7321088ac5 added a call to check for new notifications on load 2013-05-23 14:34:36 -04:00
Julian Lam
79bf5fad5b tweaks to notif window to show relative time 2013-05-23 14:32:25 -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
Baris Usakli
65e24ed5cb added admin routes to config.json 2013-05-23 13:21:24 -04:00
Julian Lam
78713f0599 Merge remote-tracking branch 'origin' into notifications 2013-05-23 13:13:35 -04:00
Baris Usakli
f4218264e2 successful >:) 2013-05-23 13:09:30 -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
Baris Usakli
37985cc383 cant send empty chat messages anymore 2013-05-23 12:41:16 -04:00
Baris Usakli
9e54602d16 removed debug code 2013-05-23 12:30:21 -04:00
Baris Usakli
3c0b86689a if same id is used it replaces the current alerts contents 2013-05-23 12:25:40 -04:00
Baris Usakli
58d12c9c7c possible fix to post window opening on page load 2013-05-23 12:10:57 -04:00
Baris Usakli
fe37dfecf7 connection/disconnection handling 2013-05-23 11:49:56 -04:00
Julian Lam
64f320743a renaming the notification window to 'alert_window' 2013-05-23 10:53:09 -04:00
Julian Lam
194793d14d Merge branch 'master' into notifications
Conflicts:
	src/websockets.js
2013-05-23 08:21:36 -04:00
Julian Lam
6f4c480cd8 interim commit on notifications dropdown 2013-05-23 08:18:54 -04:00
Julian Lam
6bae30336a foundation for user notifications 2013-05-22 21:43:01 -04:00
Baris Usakli
ad1f688e85 chat text area is readonly now 2013-05-22 17:50:57 -04:00
Baris Usakli
45e92b0b8d when u drag a chat window it comes to front 2013-05-22 17:45:03 -04:00
Baris Usakli
c7dcbb8ab2 added jquery.ui.min 2013-05-22 17:38:50 -04:00
Baris Usakli
6e8a18f475 fixed IE bug when chat message was sent post window was opening 2013-05-22 17:28:30 -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
psychobunny
17cde19020 potential fix for templates bug 2013-05-22 15:34:51 -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
93f3a0e524 adding some default text to meta title and desc 2013-05-22 13:43:18 -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
907f5d4ea6 hiding the thread rep count from the template because... we don't actually
actively have a plan for thread rep...
2013-05-21 20:28:52 -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