1304 Commits

Author	SHA1	Message	Date
barisusakli	75e5f2da74	closes #5485	2017-04-21 21:36:42 -04:00
barisusakli	97f6c0008f	add radix	2017-04-17 19:15:37 -04:00
barisusakli	fb3020f892	closes #5604	2017-04-17 18:59:46 -04:00
barisusakli	e3205bcfad	merge	2017-04-16 14:26:12 -04:00
Peter Jaszkowiak	e382bca610	Fix tests	2017-04-15 04:22:28 -06:00
Peter Jaszkowiak	0fe10f5e86	Escape topic titles at the source, deduplicate	2017-04-15 01:38:42 -06:00
barisusakli	b8c606cbbd	closes #5519	2017-04-14 10:08:50 -04:00
Julian Lam	d18cfced96	Merge remote-tracking branch 'origin/master' into develop	2017-04-12 23:57:14 -04:00
Peter Jaszkowiak	1ed571189c	Make utils and translator easier to require ... Move utils.walk to file.walk, backwards compatible	2017-04-08 20:27:52 -06:00
Barış Soner Uşaklı	fe27d40ff6	closes #5542	2017-03-23 10:58:28 +03:00
Julian Lam	4b3dcd1a02	Merge remote-tracking branch 'origin/master' into develop	2017-03-22 09:18:20 -04:00
Ben Lubar	7f713ee822	Admin option to allow all users to view votes (#5534) ... * Admin option to allow all users to view votes * Fix </strong></strong>	2017-03-17 14:08:47 -04:00
Julian Lam	69dd1e3aca	Merge branch 'master' into develop	2017-03-15 14:39:18 -04:00
Julian Lam	33bf930bb9	fixes #5528	2017-03-15 13:49:35 -04:00
barisusakli	5a2ff8ed0a	closes #5527	2017-03-14 23:03:09 +03:00
Julian Lam	4ba795b5f2	adding fallbacks for meta/config.topicsPerPage	2017-03-10 16:29:40 -05:00
Julian Lam	33d1cc6d0f	replace erroring line with operator-assignment	2017-03-10 15:56:45 -05:00
psychobunny	a67d48e719	#5513 (#5520) ... closes #5513	2017-03-10 12:50:19 -05:00
Julian Lam	db0a42d808	Merge branch 'master' into develop	2017-03-08 09:41:40 -05:00
Julian Lam	364b819a42	moving sanity checks above contentLen calculation	2017-03-08 09:41:32 -05:00
Julian Lam	dede304ee2	Merge branch 'master' into develop	2017-03-08 09:33:02 -05:00
Julian Lam	fdb4766728	wow.	2017-03-08 09:32:55 -05:00
Julian Lam	f35bf91e3b	Merge branch 'master' into develop	2017-03-08 09:20:00 -05:00
Julian Lam	5359a14bac	better handling of redactor post length calculation on post edit	2017-03-08 09:19:45 -05:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00
barisusakli	cd448f90cd	more topic tests	2017-03-02 19:03:49 +03:00
barisusakli	b1b87d339f	more refactors	2017-03-02 16:11:11 +03:00
Julian Lam	45c479a101	Merge branch 'master' into develop	2017-02-28 12:07:56 -05:00
barisusakli	8a0cf6c0ac	more admin socket tests	2017-02-28 15:16:49 +03:00
Julian Lam	6e7b505ea7	more linting	2017-02-24 12:55:31 -05:00
Julian Lam	ddea9f534e	running eslint again	2017-02-24 12:47:46 -05:00
Julian Lam	72e77772db	Merge branch 'master' into develop	2017-02-24 12:46:40 -05:00
Julian Lam	e71bd7a27f	Merge branch 'master' into styleguide	2017-02-24 11:45:04 -05:00
barisusakli	3a87f2566a	more group tests	2017-02-24 15:05:00 +03:00
barisusakli	b7d5bc7dc8	more group tests	2017-02-24 12:54:16 +03:00
Peter Jaszkowiak	dd2b930824	Resolve merge conflicts, minify only .js files	2017-02-23 18:31:49 -07:00
Julian Lam	a9f144230e	Merge branch 'master' into develop	2017-02-23 13:57:46 -05:00
Julian Lam	25f6293821	using io.origins instead	2017-02-23 13:26:52 -05:00
Julian Lam	91d3ce1abc	Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472" ... This reverts commit c1b1ff5c6e.	2017-02-23 13:26:52 -05:00
Julian Lam	a4c00663ff	Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472" ... This reverts commit c1b1ff5c6e.	2017-02-23 13:13:59 -05:00
Julian Lam	8154e29ad5	Merge branch 'master' into develop	2017-02-23 13:08:20 -05:00
Julian Lam	c1b1ff5c6e	adding origin to new local ioConfig var, as per @barisusakli, re: #5472	2017-02-23 12:47:06 -05:00
Julian Lam	672d7352bb	Merge branch 'master' into develop	2017-02-23 12:32:03 -05:00
Julian Lam	d4c2fc3bc8	closes #5472	2017-02-23 11:54:51 -05:00
barisusakli	0de21cb3ff	fix tab	2017-02-23 17:12:46 +03:00
barisusakli	09d0ce4778	post tests	2017-02-23 17:02:54 +03:00
barisusakli	2dac3d2292	closes #5465, blacklist tests	2017-02-22 14:53:44 +03:00
Julian Lam	e427f1663e	Merge pull request #5456 from NodeBB/sounds-refactor ... Sound system improvements	2017-02-21 16:14:58 -05:00
Julian Lam	62e0f5f883	Merge remote-tracking branch 'origin/master' into develop	2017-02-21 11:21:51 -05:00
barisusakli	799f688503	closes #5463 , invitation tests	2017-02-21 15:08:17 +03:00