8655 Commits

Author	SHA1	Message	Date
Peter Jaszkowiak	34af855848	Fix npm@5 saving by default	2017-06-01 14:16:13 -06:00
Peter Jaszkowiak	8e5bcf6105	Fix #5727	2017-06-01 14:16:07 -06:00
Peter Jaszkowiak	e71fb9ab24	Fix node --inspect	2017-06-01 14:15:40 -06:00
Peter Jaszkowiak	9a3b684228	Remove dependency, ignore package-lock.json	2017-06-01 14:15:30 -06:00
Peter Jaszkowiak	44e55d2a98	Less synchronous stuffs	2017-06-01 14:14:43 -06:00
Julian Lam	0ea89c2799	fixes #5608	2017-06-01 15:46:35 -04:00
Julian Lam	3467071a7d	fixed extra line break in upgrade scripts introduced in 5516352758	2017-06-01 15:02:55 -04:00
psychobunny	c94365aefd	closes #5721	2017-05-31 16:35:18 -04:00
Barış Soner Uşaklı	92376a1589	fix calls	2017-05-31 13:13:16 -04:00
Baris Usakli	da8b1b605c	#5723	2017-05-30 17:21:34 -04:00
Baris Usakli	ba9397987a	if no email dont send	2017-05-30 14:27:03 -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
psychobunny	fa25dcd6a5	move ACP category selector in line with pills	2017-05-29 18:26:20 -04:00
psychobunny	88d5f97280	closes #5717	2017-05-29 17:12:02 -04:00
Baris Usakli	d7684b042f	fix tab	2017-05-29 14:52:10 -04:00
Baris Usakli	1fa52267d4	Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/src/admin/manage/category.js	2017-05-29 14:48:25 -04:00
Baris Usakli	de5fe25e57	closes #5715	2017-05-29 14:47:01 -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
Peter Jaszkowiak	d4e7db45b7	Use zipObject, more test-related ignores	2017-05-29 11:23:25 -06:00
Baris Usakli	dc0971c122	up composer	2017-05-29 13:13:16 -04:00
Peter Jaszkowiak	3da2e1f07f	Merge branch '_lodash' of github.com:nodebb/nodebb into _lodash	2017-05-29 11:08:42 -06:00
Peter Jaszkowiak	dfbb96d47b	Remove require.main.require	2017-05-28 23:02:01 -06:00
Peter Jaszkowiak	7127f34818	Fix indent	2017-05-28 16:52:36 -06:00
Barış Soner Uşaklı	9664033b73	add memory usage to info page	2017-05-28 18:40:32 -04:00
Barış Soner Uşaklı	8eb5564977	fix popular sort	2017-05-28 17:21:49 -04:00
Barış Soner Uşaklı	3049f5cf1f	#5522 test	2017-05-28 01:26:56 -04:00
Barış Soner Uşaklı	6635b50c35	closes #5522	2017-05-28 01:10:19 -04:00
Barış Soner Uşaklı	937d6dd4df	fix acp privilege page not loading	2017-05-28 01:10:19 -04:00
Barış Soner Uşaklı	5e90e4db02	closes #5618	2017-05-27 23:58:12 -04:00
Barış Soner Uşaklı	08aaabd33c	closes #5642	2017-05-27 23:32:55 -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ı	bcc566fb68	remove unnecessary checks	2017-05-27 00:47:04 -04:00
Barış Soner Uşaklı	f1b8492164	remove unnecessary checks	2017-05-27 00:30:07 -04:00
Barış Soner Uşaklı	6a742ead38	style	2017-05-26 23:55:20 -04:00
Barış Soner Uşaklı	8e31ec7199	closes #5705	2017-05-26 23:30:23 -04:00
Barış Soner Uşaklı	3d1b1a9423	closes #5706	2017-05-26 23:21:46 -04:00
Barış Soner Uşaklı	dcf3db104b	search style	2017-05-26 22:28:12 -04:00
Barış Soner Uşaklı	9ec65db539	closes #5711	2017-05-26 21:52:08 -04:00
Barış Soner Uşaklı	5c51a91e85	fix reward claimable check	2017-05-26 18:34:45 -04:00
Barış Soner Uşaklı	fb45b498a2	fix lint	2017-05-26 18:11:42 -04:00
psychobunny	c133efa258	Fix tests	2017-05-26 18:08:03 -04:00
psychobunny	d70ccb1868	closes #5708	2017-05-26 17:20:30 -04:00
Baris Usakli	61eb7aa68b	more tests	2017-05-26 16:56:26 -04:00
Baris Usakli	11d9410229	fix test and image normalize test	2017-05-26 16:37:31 -04:00
Baris Usakli	081ac6535c	style change	2017-05-26 16:14:25 -04:00