8673 Commits

Author	SHA1	Message	Date
Barış Soner Uşaklı	b13ed26587	closes #5755	2017-06-13 20:15:48 -04:00
Baris Usakli	8ea5c060f5	closes #5754	2017-06-13 15:20:31 -04:00
Barış Soner Uşaklı	f1cbf563fc	closes #5751	2017-06-12 12:56:03 -04:00
Barış Soner Uşaklı	22131640fd	closes #5749	2017-06-08 17:17:46 -04:00
psychobunny	50367a971e	req should be req. 👍	2017-06-07 20:18:04 -04:00
Barış Soner Uşaklı	a49a9a07b3	refactor groups.delete	2017-06-02 18:19:06 -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	3e6a779dbc	Merge remote-tracking branch 'origin/master'	2017-06-02 15:06:44 -04:00
Julian Lam	6728e9a5cc	#5729	2017-06-02 15:01:24 -04:00
Barış Soner Uşaklı	14ea9a0dd6	Merge pull request #5716 from NodeBB/import-export-ref ... Import export cleanup	2017-06-02 13:37:16 -04:00
Julian Lam	b3c9992ba3	made upgrade script log verbose	2017-06-02 11:16:28 -04:00
Julian Lam	88a763e08b	changes to upgrade script progress bars to work better on narrow terminals, fixes #5732	2017-06-02 10:58:39 -04:00
Julian Lam	b4870654fc	Merge pull request #5728 from NodeBB/patch-pitaj ... Assorted Fixes	2017-06-02 10:14:50 -04:00
Barış Soner Uşaklı	ddb83b3eab	closes #5731	2017-06-01 20:57:56 -04:00
Julian Lam	29e868b002	closes #5585	2017-06-01 16:24:45 -04:00
Barış Soner Uşaklı	5a55c882ab	convert NaN uids to 0	2017-06-01 16:17:08 -04:00
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
Peter Jaszkowiak	b60dbe7d1e	Unwrap meta modules	2017-05-31 16:24:23 -06: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