11415 Commits

Author	SHA1	Message	Date
psychobunny	d0862911d3	closes #4181	2016-02-23 12:21:32 -05:00
barisusakli	2b90040c31	closes #4236	2016-02-23 16:46:10 +02:00
barisusakli	6951dc1fe2	closes #4211	2016-02-23 15:35:16 +02:00
barisusakli	738b892074	closes #4217	2016-02-23 14:41:15 +02:00
barisusakli	4608b8f07b	closes #4183	2016-02-23 13:34:16 +02:00
barisusakli	46c8101c5c	closes #4152	2016-02-23 13:08:51 +02:00
pichalite	6ecc05afd4	throw error in chat if no users in room	2016-02-23 00:52:43 +00:00
psychobunny	933115a853	almost had a heartattack when I saw 121 changed files in this conflict ... # Conflicts: # src/meta/templates.js	2016-02-22 14:41:03 -05:00
psychobunny	914fc1543e	meta/templates.js refactor	2016-02-22 14:25:04 -05:00
psychobunny	da5494fdf1	allow recursive base templates ... ex. custom theme based off lavender which is based off vanilla	2016-02-22 14:20:50 -05:00
Terry Tate	3e75c6f6a3	Update to nodemailer 2.0 syntax for smtpTransport ... Fixes #4193	2016-02-21 17:13:44 +00:00
Ole R	6d35690cbb	Prevent breaking eventLoopLagThreshold value ... [This problem](https://community.nodebb.org/topic/7955/and-once-again-all-my-data-has-gone/4) occurs when you put a value less than `10`.	2016-02-20 19:52:26 +01:00
barisusakli	2b7ed63236	fix for groups that don't have private field	2016-02-20 09:40:14 +02:00
Barış Soner Uşaklı	e39fda2b45	filter dupe tags, closes #4216	2016-02-19 21:58:21 +02:00
Julian Lam	dd050c8177	added new hook that is called before templates are compiled	2016-02-18 20:43:06 -05:00
pichalite	bd8b32b406	search banned users only on /users/banned route	2016-02-18 22:34:34 +00:00
pichalite	42239e119d	search banned users only on /users/banned route	2016-02-18 22:30:42 +00:00
Barış Soner Uşaklı	573840ccbd	changed to title raw	2016-02-18 20:26:09 +02:00
barisusakli	2fc385f723	closes #4141, closes #4149	2016-02-18 18:32:16 +02:00
barisusakli	e306194065	style	2016-02-17 20:22:00 +02:00
barisusakli	654961ca3b	style	2016-02-17 20:15:14 +02:00
barisusakli	3d4e058b6a	closes #4192	2016-02-17 17:56:37 +02:00
barisusakli	f0cc9120ba	fix undefined next	2016-02-17 09:23:04 +02:00
akhoury	f47c06279a	added depracation warning	2016-02-16 23:07:36 -05:00
akhoury	bdc8e6f04f	Merge remote-tracking branch 'upstream/master'	2016-02-16 22:54:59 -05:00
Barış Soner Uşaklı	141d1b8ece	dont update visible:memberCount if group is hidden, closes #4195	2016-02-16 23:26:06 +02:00
Barış Soner Uşaklı	8f25994482	fix for async whilst derp	2016-02-16 20:25:23 +02:00
Barış Soner Uşaklı	88e4591f88	closes #4194	2016-02-16 18:04:02 +02:00
Julian Lam	10024d7b93	fixed #4186	2016-02-15 15:32:01 -05:00
Julian Lam	30736c0ee9	allowed 'system' to be passed into group creation now	2016-02-15 11:53:01 -05:00
barisusakli	8276090d71	closes #4180	2016-02-13 14:39:44 +02:00
barisusakli	2fd121dc15	#4154	2016-02-13 09:37:26 +02:00
akhoury	496e5ae8bf	comment	2016-02-12 12:30:39 -05:00
akhoury	7f0c46b3a7	Merge remote-tracking branch 'upstream/master'	2016-02-12 12:21:13 -05:00
akhoury	4245cb2739	adding cls support for ws	2016-02-12 12:20:21 -05:00
Julian Lam	414762d382	closes #4157	2016-02-10 15:26:14 -05:00
Julian Lam	119930131d	fixed errors when uploading files	2016-02-10 15:23:56 -05:00
Ole R	7484389a41	Update array-check to Array.isArray	2016-02-10 15:04:55 +01:00
barisusakli	93ae5e2a3f	style change	2016-02-10 13:05:02 +02:00
barisusakli	d7df6c0b06	remove more from config	2016-02-10 12:53:39 +02:00
barisusakli	5ac02a59ac	remove some more config from api/config	2016-02-10 12:12:13 +02:00
barisusakli	c62a60029a	fix incorrect id	2016-02-10 12:07:38 +02:00
barisusakli	ebf820d571	remove from global config	2016-02-10 11:33:41 +02:00
barisusakli	5b6e8bd167	closes #4171	2016-02-10 08:50:58 +02:00
Julian Lam	3a6ad52ac8	closes #4164	2016-02-09 09:45:16 -05:00
barisusakli	6963632846	closes #4167	2016-02-09 09:43:32 +02:00
barisusakli	4b3f09deea	closes #4154	2016-02-08 12:21:23 +02:00
akhoury	852a1a178e	oops	2016-02-07 13:34:24 -05:00
akhoury	61c76e4aba	add continuation-local-storage support	2016-02-07 13:16:50 -05:00
Barış Soner Uşaklı	d3087b4e05	changed userTitle of global mods	2016-02-05 18:35:20 +02:00