12175 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pichalite	eba107cef4	fix Mac platform case	2016-02-23 23:17:25 -08:00
psychobunny	e37cbca977	closes #3320	2016-02-23 18:35:37 -05:00
psychobunny	e8b1903586	#4102	2016-02-23 18:05:54 -05:00
psychobunny	afbf7de92a	up persona	2016-02-23 17:57:27 -05:00
psychobunny	f51698804a	closes #4177	2016-02-23 17:41:21 -05:00
psychobunny	b74022689f	closes #4174	2016-02-23 17:41:19 -05:00
psychobunny	582b69dbbc	Merge pull request #4253 from pichalite/recent-chats ... account for search input when calculating recent list height	2016-02-23 17:30:44 -05:00
psychobunny	27d4426e06	up persona	2016-02-23 17:19:06 -05:00
psychobunny	911892c5b0	closes #3870	2016-02-23 17:17:55 -05:00
psychobunny	99719414fe	closes #4052	2016-02-23 17:10:34 -05:00
psychobunny	e069150625	closes #2165	2016-02-23 16:06:02 -05:00
pichalite	991d85cae2	account for search input when calculating recent list height on expanded chats	2016-02-23 20:30:25 +00:00
psychobunny	efb6a9fe7e	added option to skip asset compilation on initial grunt startup with --skip flag	2016-02-23 14:26:16 -05:00
psychobunny	b18052210d	closes #3146	2016-02-23 14:23:57 -05:00
psychobunny	637c20f44d	closes #3526	2016-02-23 14:17:04 -05:00
Julian Lam	946a082eaa	latest translations and fallbacks	2016-02-23 14:11:15 -05:00
psychobunny	072089e39c	up persona	2016-02-23 14:01:17 -05:00
psychobunny	b8eb19b991	closes #3993	2016-02-23 13:57:00 -05:00
psychobunny	75917e25b3	closes #4026	2016-02-23 13:33:46 -05:00
psychobunny	1dba781923	closes #4203	2016-02-23 13:25:44 -05:00
psychobunny	92810527ea	closes #4191	2016-02-23 13:23:09 -05:00
psychobunny	a3530340a9	Merge pull request #4250 from pichalite/issue-4228 ... throw error in chat if no users in room	2016-02-23 13:18:34 -05:00
psychobunny	cd0cb5c5f1	closes #4237	2016-02-23 13:16:41 -05:00
Julian Lam	ff8e1b52e0	fixed #4251	2016-02-23 13:15:45 -05:00
Julian Lam	322d4052b0	chat controls now hidden instead of taking up space in chat modal	2016-02-23 13:01:36 -05:00
psychobunny	a0a98e64b7	closes #4220	2016-02-23 12:55:46 -05:00
psychobunny	4a12a06745	closes #4252	2016-02-23 12:42:21 -05:00
psychobunny	d0862911d3	closes #4181	2016-02-23 12:21:32 -05:00
Julian Lam	3b76b0343b	Revert "fixes NodeBB/nodebb-theme-persona#218" ... This reverts commit ee529d92d3.	2016-02-23 11:07: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	58a849f206	up composer default	2016-02-23 14:52:42 +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	18bc7713ef	Merge branch 'master' of https://github.com/NodeBB/NodeBB	2016-02-22 14:41:10 -05: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
Julian Lam	2cf42f55f5	latest translation	2016-02-22 14:37:50 -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
Julian Lam	13dfe6cd51	Merge pull request #4243 from pichalite/issue-4241 ... don't mention guest on reply	2016-02-22 14:00:07 -05:00
Julian Lam	20103b64ce	Merge pull request #4219 from pichalite/groups ... add missing translation in groups	2016-02-22 13:59:47 -05:00
pichalite	fba4e93cfe	remove translator	2016-02-22 10:47:29 -08:00
pichalite	872b33f0cc	fix typo	2016-02-22 10:46:10 -08:00
Julian Lam	c551e0fd82	updated to latest nodemailer smtp transport	2016-02-22 11:02:39 -05:00
Julian Lam	30d980b01a	updated theme and plugin minvers	2016-02-22 10:19:33 -05:00
Julian Lam	65407cb71f	Merge pull request #4239 from ds-terrytate/fix-gmail-smtp-nodemailer ... Update to nodemailer 2.0 syntax for smtpTransport	2016-02-22 10:08:23 -05:00
Julian Lam	60a5a1b422	latest translations	2016-02-22 09:52:55 -05:00
Julian Lam	a61fea862b	Merge pull request #4245 from pichalite/issue-4159 ... fixes #4159	2016-02-22 09:42:41 -05:00