1386 Commits

Author	SHA1	Message	Date
Baris Soner Usakli	6a824a2e10	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-06 17:57:15 -05:00
Baris Soner Usakli	7dfdab0a2d	search page change	2014-03-06 17:57:07 -05:00
Julian Lam	1f23642ab4	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-06 15:38:02 -05:00
Julian Lam	e9e53ad95e	added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example)	2014-03-06 15:32:06 -05:00
Baris Soner Usakli	7135e9424c	closes #1167	2014-03-06 13:32:26 -05:00
Baris Soner Usakli	3fe9bdc24c	removed the postbar selector from activeusers	2014-03-06 13:08:22 -05:00
MrWaffle	33a5a2177e	Send the callback to the retry	2014-03-05 20:57:32 +01:00
Baris Soner Usakli	76d8d09f9b	closes #1141	2014-03-04 16:48:07 -05:00
Baris Soner Usakli	d100a41ce7	fixes topic follow	2014-03-04 15:23:26 -05:00
Baris Soner Usakli	8c11299197	template language fix	2014-03-04 14:56:05 -05:00
medwards20x6	76b53478ce	Don't fire click when closing an alert	2014-03-04 10:30:44 -08:00
Baris Soner Usakli	dbb814fe4e	category permission page fixes	2014-03-04 12:54:25 -05:00
Baris Soner Usakli	be70b3de57	closes #1090	2014-03-03 15:26:15 -05:00
Baris Soner Usakli	529cd60dd2	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-03-03 14:46:57 -05:00
Baris Soner Usakli	70299ea5c2	better search result page	2014-03-03 14:46:50 -05:00
Julian Lam	64ee792013	fixed #1154	2014-03-03 11:12:28 -05:00
Julian Lam	5a8fa9b1f7	fixed regression in groups management modal	2014-03-03 11:07:37 -05:00
Baris Soner Usakli	98fa8c419d	closes #1152	2014-03-02 19:55:26 -05:00
Baris Soner Usakli	e4b6d0e1ff	closes #1096	2014-03-02 16:58:49 -05:00
Baris Soner Usakli	5732994097	reset_code click fix	2014-03-01 23:18:05 -05:00
Baris Soner Usakli	1b7f8cc5cb	active users fix	2014-03-01 22:51:39 -05:00
Julian Lam	77f5d6ff7d	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-01 22:00:28 -05:00
Julian Lam	1c324f45cf	tried fixing absentee detection in active users	2014-03-01 21:59:51 -05:00
Baris Soner Usakli	c6ff8e1042	#1148	2014-03-01 21:55:29 -05:00
Julian Lam	2b178ff76d	proper tracking of users' reply status when others enter the room	2014-03-01 21:31:50 -05:00
Julian Lam	a9b78d2600	minimizing the composer should unregister it	2014-03-01 17:49:39 -05:00
Julian Lam	68fb6ec09a	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-03-01 17:36:30 -05:00
Julian Lam	f2ffc2b533	properly referencing the tid of the composer instead of blindly checking templates.get('topic_id')	2014-03-01 17:34:06 -05:00
Baris Soner Usakli	3c6e4ebda1	possible fix to #1148	2014-03-01 17:11:49 -05:00
Julian Lam	7ef84e0daa	switched to 'ping active' system	2014-03-01 16:53:41 -05:00
Julian Lam	b3d7ae1c86	showing who is replying in the active users block	2014-03-01 15:46:13 -05:00
Baris Soner Usakli	8eca195530	updateHeader once on load	2014-02-28 22:08:33 -05:00
Baris Soner Usakli	84dc012198	closes #1142	2014-02-28 18:17:17 -05:00
Baris Soner Usakli	e75c303b89	added unique visitor count to admin dashboard	2014-02-28 17:19:42 -05:00
Baris Soner Usakli	6bf36a0468	if alert is closed dont fire clickfn	2014-02-28 16:23:46 -05:00
Baris Soner Usakli	eea677655f	minor clean up to categories.js	2014-02-28 16:13:19 -05:00
Baris Soner Usakli	eac201cae9	no need to do these on every ajaxify into categories	2014-02-28 15:56:30 -05:00
Baris Soner Usakli	7eae79cee9	anons cant chat	2014-02-28 15:36:57 -05:00
Baris Soner Usakli	ccd29bfd61	added callback to category update	2014-02-28 15:25:50 -05:00
Baris Soner Usakli	8064f7f0db	scroll fix	2014-02-28 00:59:35 -05:00
Baris Soner Usakli	9b4ca12dc1	fixed missing var, posts.js cleanup	2014-02-28 00:14:11 -05:00
Baris Soner Usakli	091723a8c5	closes #1101	2014-02-27 23:45:12 -05:00
Baris Soner Usakli	389fc787a3	Merge branch 'master' of https://github.com/designcreateplay/NodeBB	2014-02-27 15:35:58 -05:00
Baris Soner Usakli	c49c3e3550	fixed jquery ui package	2014-02-27 15:35:50 -05:00
Julian Lam	dfd13fac0d	Merge branch 'master' of github.com:designcreateplay/NodeBB	2014-02-27 14:05:55 -05:00
Julian Lam	44ac7ec262	added new hooks for rendering help messages in composer, removed markdown text from translation	2014-02-27 14:05:31 -05:00
Baris Soner Usakli	30eb85f96e	fixed conflicts	2014-02-27 12:46:37 -05:00
Baris Soner Usakli	0ca6c58ded	closes #1137	2014-02-27 12:15:26 -05:00
akhoury	2209a55afc	- changes per PR conversation	2014-02-26 23:34:03 -05:00
akhoury	0070e1158e	removing a boolean left out from the addEventListener definition	2014-02-26 22:32:09 -05:00