13138 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
barisusakli	dff3d7f20e	various group chat fixes #3980 ... fix multiple modals using the same tagsinput fix online user getting chat notification fix owner not being able to remove users in the chat modal	2015-12-21 10:14:44 +02:00
barisusakli	80fd0b20bd	closes #3970	2015-12-19 20:52:20 +02:00
barisusakli	1449d438f5	closes #3969	2015-12-19 20:41:56 +02:00
barisusakli	f0b333e8a1	closes #3929	2015-12-19 20:20:41 +02:00
barisusakli	b1d530298d	up vanilla	2015-12-19 19:25:09 +02:00
barisusakli	97dfa81fe6	up persona	2015-12-19 19:15:48 +02:00
Julian Lam	fe5e5ea8ef	fixing another null crash	2015-12-19 12:13:51 -05:00
barisusakli	f73e6eb4a1	fix related	2015-12-19 19:10:16 +02:00
Barış Soner Uşaklı	a5385d81fd	Merge pull request #3968 from NodeBB/group-chat ... Group chat closes #1798	2015-12-19 18:55:16 +02:00
barisusakli	d209daf312	Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat	2015-12-19 18:31:53 +02:00
Julian Lam	5d43da0d1c	0.9.3	2015-12-19 11:06:38 -05:00
barisusakli	5e9a656709	Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat	2015-12-19 17:21:52 +02:00
barisusakli	80544119dc	some changes to related code	2015-12-19 17:21:09 +02:00
Julian Lam	fe90dd77c1	fixed #3967	2015-12-19 09:31:03 -05:00
psychobunny	b2049e7acf	add color/bgColor to return	2015-12-18 16:58:07 -05:00
Julian Lam	0ded293caf	removed JSONP listener	2015-12-18 16:58:29 -05:00
Julian Lam	04879e6da2	updated jquery-timeago locales	2015-12-18 14:13:47 -05:00
Julian Lam	668adc5187	fixing bootswatch integration	2015-12-18 12:56:24 -05:00
Julian Lam	af55f55b45	latest translations	2015-12-18 12:49:10 -05:00
barisusakli	270f8130da	closes #3952	2015-12-18 13:32:53 +02:00
barisusakli	351bf6c327	fix tests	2015-12-18 13:19:16 +02:00
barisusakli	26ac05dd5c	Merge remote-tracking branch 'refs/remotes/origin/master' into group-chat	2015-12-18 13:16:55 +02:00
barisusakli	9981555042	rename	2015-12-18 13:14:44 +02:00
barisusakli	e067d26ca3	closes #3961	2015-12-18 13:09:47 +02:00
Julian Lam	a091067175	closes #3963	2015-12-17 18:22:09 -05:00
psychobunny	89901b2caa	reorganized settings/tags acp	2015-12-17 16:53:42 -05:00
psychobunny	339b4c30fc	ability to set maximum related topics rendered in ACP	2015-12-17 16:52:02 -05:00
psychobunny	ba719148c1	generic "related topics" functionality	2015-12-17 16:44:43 -05:00
Julian Lam	0af11c5c0c	fallbacks for new notification groupings	2015-12-17 14:01:08 -05:00
Julian Lam	bdeb97e225	updating composer minver again	2015-12-17 09:40:53 -05:00
Julian Lam	065bb8ebc4	#3962	2015-12-17 09:35:41 -05:00
barisusakli	4827ea04fc	messaging.getTeaser	2015-12-17 12:35:49 +02:00
barisusakli	5a26eb1c76	IS fix, timeago fix	2015-12-17 12:25:30 +02:00
barisusakli	3d79e0750b	fix edit delete for rooms	2015-12-17 12:05:35 +02:00
barisusakli	992ca0a351	fix taskbar icon	2015-12-17 11:56:28 +02:00
barisusakli	d2b54ae0f8	display less derpy chat list	2015-12-17 11:47:32 +02:00
barisusakli	f71fd0a3ec	only allow users in the room to get raw message content	2015-12-17 11:22:22 +02:00
psychobunny	3ce9d0ac2f	fixed ordered lists in post content	2015-12-16 17:39:21 -05:00
psychobunny	23c2fb2b52	un-nuking @julianlam :rage1: also fixed for latest BS	2015-12-16 17:24:07 -05:00
psychobunny	8b04b4fe50	up persona	2015-12-16 16:55:50 -05:00
Julian Lam	f4187fc671	fixing crash with deleted notifications	2015-12-16 15:33:00 -05:00
Barış Soner Uşaklı	f4e502c793	simpler isNewSet	2015-12-16 21:52:42 +02:00
Julian Lam	40f0076b77	fixed bug with notif merging	2015-12-16 14:30:58 -05:00
Julian Lam	9f5815555a	fixed null error with notif grouping	2015-12-16 13:56:12 -05:00
Julian Lam	05df8900db	closes #3912	2015-12-16 12:15:26 -05:00
Julian Lam	9db0f59432	part of #3912	2015-12-16 12:15:26 -05:00
Julian Lam	33a3a56fd7	Fixed issue where -w and -a flags didn't work in NodeBB reset.	2015-12-16 10:04:58 -05:00
Julian Lam	e602d2ad4d	closes #3932	2015-12-16 09:42:17 -05:00
barisusakli	002e931a9c	rev	2015-12-16 16:41:39 +02:00
barisusakli	da5891bcf6	remove debug	2015-12-16 15:49:39 +02:00