1356 Commits

Author	SHA1	Message	Date
Baris Usakli	bc6b1a8f56	Merge remote-tracking branch 'refs/remotes/origin/master' into develop ... # Conflicts: # public/src/admin/extend/plugins.js	2017-08-11 11:33:06 -04:00
Baris Usakli	bd5edc55aa	closes #5086	2017-08-02 13:45:00 -04:00
Julian Lam	184dacf1d7	Merge branch 'master' into develop	2017-07-20 13:19:41 -04:00
Julian Lam	d9ace1723c	removed references to libs that aren't used	2017-07-17 12:40:50 -04:00
Barış Soner Uşaklı	cc4f4e7282	style changes	2017-07-15 16:57:41 -04:00
Julian Lam	a2627d2066	added default payload to emails, and adding nodebb logo for email header	2017-07-13 11:30:44 -04:00
Julian Lam	9c71da1577	sending callback with welcome email test	2017-07-12 15:20:30 -04:00
Baris Usakli	5167c1aa4f	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-28 14:19:29 -04:00
Julian Lam	3bd02d58e3	fixes logic that allowed posts beyond maximum post length if min is set to 0, @barisusakli	2017-06-28 12:25:51 -04:00
Julian Lam	28d8be8b9d	fixed #5782	2017-06-28 11:20:57 -04:00
Baris Usakli	1b0c6741f8	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-22 14:52:49 -04:00
Baris Usakli	cf444755df	closes #5729	2017-06-20 14:23:21 -04:00
Barış Soner Uşaklı	50f2a4ed19	remove dupe hook	2017-06-16 17:51:31 -04:00
Barış Soner Uşaklı	d9e84b1db8	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-13 20:58:19 -04:00
Baris Usakli	8ea5c060f5	closes #5754	2017-06-13 15:20:31 -04:00
Baris Usakli	037a0e5239	closes #5742 ... also fix reverse infinite scroll when sorting is changed	2017-06-06 16:40:32 -04:00
Barış Soner Uşaklı	e56178f72e	remove init socket.io	2017-06-02 17:18:58 -04:00
Barış Soner Uşaklı	2ae855678a	closes #5735	2017-06-02 15:30:59 -04:00
Julian Lam	6728e9a5cc	#5729	2017-06-02 15:01:24 -04:00
Baris Usakli	d13eb52f39	closes #5722	2017-05-30 14:10:16 -04:00
Julian Lam	12524b5ce4	fix lint	2017-05-30 13:17:26 -04:00
Julian Lam	d2b5b53cb4	refactor for sendValidationEmail, and sending better dummy data for welcome email template	2017-05-30 13:09:30 -04:00
Julian Lam	7ce208ca13	Better dummy data for testing banned email template	2017-05-30 12:11:44 -04:00
Julian Lam	313d48b47d	updated emailer code so digest emails when tested in ACP are sent with real data instead of incomplete fake data	2017-05-30 12:11:44 -04:00
Barış Soner Uşaklı	59b1d8fbae	Merge pull request #5710 from NodeBB/_lodash ... Switch from underscore to lodash	2017-05-29 13:38:21 -04:00
Barış Soner Uşaklı	5e90e4db02	closes #5618	2017-05-27 23:58:12 -04:00
Peter Jaszkowiak	3c2d4fe649	Switch from underscore to lodash	2017-05-27 14:51:45 -06:00
Barış Soner Uşaklı	890c2eff70	style changes	2017-05-27 01:44:26 -04:00
Barış Soner Uşaklı	3d1b1a9423	closes #5706	2017-05-26 23:21:46 -04:00
Barış Soner Uşaklı	f6ac92111b	style changes	2017-05-26 00:02:20 -04:00
psychobunny	1b98449686	closes #5704	2017-05-25 15:17:24 -04:00
Barış Soner Uşaklı	5cb53406fe	more picture tests	2017-05-24 12:03:30 -04:00
Barış Soner Uşaklı	b8cc67dfff	social tests	2017-05-23 20:43:09 -04:00
Barış Soner Uşaklı	9af252b899	notifications tests	2017-05-20 21:01:55 -04:00
Barış Soner Uşaklı	7fb45cc148	more tests	2017-05-20 20:03:46 -04:00
Barış Soner Uşaklı	77894915eb	closes #5684	2017-05-19 19:35:10 -04:00
Barış Soner Uşaklı	6fdad4b002	fix test on redis	2017-05-13 22:12:52 -04:00
Barış Soner Uşaklı	70adcd64bc	#5667	2017-05-12 14:58:40 -04:00
Julian Lam	816809ce3c	fixes #5606	2017-05-11 16:53:35 -04:00
Julian Lam	064a8aa6d7	Allowing custom date range to be supplied in pageviews graph, closes #5541	2017-05-11 11:41:36 -04:00
Julian Lam	ad14b0d60b	more fixes for #5660	2017-05-09 15:07:59 -04:00
Barış Soner Uşaklı	bf78786a68	flag controller tests	2017-05-09 14:31:32 -04:00
Barış Soner Uşaklı	3a1eba2537	merge	2017-05-08 13:49:35 -04:00
psychobunny	480352c650	send the banned user an email with reason + time limit if applies	2017-05-06 02:37:00 -04:00
psychobunny	41b4ef859f	add ban messaging when logged in	2017-05-05 19:50:50 -04:00
psychobunny	b3bd70235a	refactor ban messaging; add ban duration to message; use bootbox instead of alert	2017-05-05 19:31:49 -04:00
psychobunny	c330218920	revoke sessions as soon as user is banned	2017-05-05 19:15:37 -04:00
Barış Soner Uşaklı	6fb90a17e0	closes #5613	2017-05-01 21:38:03 -04:00
Barış Soner Uşaklı	7a1a030865	closes #5640	2017-05-01 20:40:04 -04:00
Barış Soner Uşaklı	c0807ab327	closes #5639	2017-05-01 15:37:58 -04:00