583 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Baris Usakli	8f281e9792	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-05-23 16:35:39 -04:00
Baris Usakli	0f2014193d	top bar fix	2013-05-23 16:35:34 -04:00
Julian Lam	d71a38c4f7	minor styling changes to notif window	2013-05-23 16:03:45 -04:00
Julian Lam	e6218bb74a	Merge branch 'master' of github.com:psychobunny/node-forum	2013-05-23 15:54:17 -04:00
Julian Lam	2a829a0618	derpy globals to get notification pushing working for sockets on new notification event	2013-05-23 15:53:55 -04:00
Baris Usakli	c02e235005	border radius 0px on home	2013-05-23 15:44:00 -04:00
Baris Usakli	141500266a	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2013-05-23 15:41:40 -04:00
Baris Usakli	16bf813dcd	home page derp	2013-05-23 15:41:28 -04:00
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	0f51843213	if there are no topics in a category and you make the first topic it doesnt show up until you reload the page	2013-05-23 15:16:06 -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	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