1318 Commits

Author	SHA1	Message	Date
Barış Soner Uşaklı	f3c4d2ebe3	closes #5636	2017-04-28 19:35:48 -04:00
Barış Soner Uşaklı	59d0815073	closes #5637	2017-04-28 18:48:32 -04:00
barisusakli	33e8ecc1f4	closes #5404	2017-04-22 19:07:57 -04:00
barisusakli	e3205bcfad	merge	2017-04-16 14:26:12 -04:00
Peter Jaszkowiak	0fe10f5e86	Escape topic titles at the source, deduplicate	2017-04-15 01:38:42 -06:00
barisusakli	e63559b6fd	closes #5484	2017-04-14 12:59:36 -04:00
Julian Lam	a141835cf8	Merge branch 'master' into develop	2017-04-13 16:45:46 -04:00
Peter Jaszkowiak	1fb48ef7a7	Fix #5592 (#5593) ... * Fix #5592 Escape translation tokens in topic titles, descriptions, profile about, and post contents * Fix tests	2017-04-13 21:37:54 +03:00
Julian Lam	d18cfced96	Merge remote-tracking branch 'origin/master' into develop	2017-04-12 23:57:14 -04:00
Julian Lam	a62a4e698f	Merge pull request #5578 from NodeBB/utils-translator-require ... Make utils and translator easier to require	2017-04-12 23:16:59 -04:00
Peter Jaszkowiak	484a800327	Merge branch master into develop	2017-04-12 21:11:39 -06: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
pichalite	d4de345e87	syntax	2017-04-07 21:39:22 +00:00
pichalite	4c89497cc4	Closes #5521	2017-04-07 20:57:00 +00:00
André Zanghelini	03d432182b	Fix postcount is expected to be Number (#5567)	2017-04-03 12:45:43 -04:00
Peter Jaszkowiak	81696dd24a	Fxi #5561	2017-03-31 14:45:03 -06:00
Julian Lam	0e157d93ea	Merge remote-tracking branch 'origin/master' into develop	2017-03-24 15:52:58 -04:00
Julian Lam	a49e647de3	fixes #5545 again	2017-03-24 14:46:51 -04:00
Julian Lam	b649eb95f8	Merge remote-tracking branch 'origin/master' into develop	2017-03-24 14:37:39 -04:00
Julian Lam	31b6d47f88	fixes #5545	2017-03-24 14:36:54 -04:00
Barış Soner Uşaklı	fe27d40ff6	closes #5542	2017-03-23 10:58:28 +03:00
barisusakli	5a2ff8ed0a	closes #5527	2017-03-14 23:03:09 +03:00
Julian Lam	860999fa6c	Merge remote-tracking branch 'origin/master' into develop	2017-03-10 15:44:29 -05:00
barisusakli	3b41c40b93	refactor deleter code to use unixtimestamp	2017-03-10 22:22:08 +03:00
psychobunny	f2eb4b8083	closes #5439	2017-03-10 14:03:07 -05:00
psychobunny	b3f8428691	closes #5510	2017-03-10 13:36:24 -05:00
barisusakli	32d37465fb	limit size of select	2017-03-08 20:09:35 +03:00
barisusakli	47af3eb7e5	use the real count	2017-03-08 19:49:32 +03:00
Julian Lam	793555a344	Merge branch 'master' into develop	2017-03-07 14:35:49 -05:00
Julian Lam	1102ca8ebb	fix issue where an auto-redirect to SSO on login route was failing if invoked via API call (ajaxify)	2017-03-07 14:35:38 -05:00
barisusakli	b7e6104bbc	closes #5511	2017-03-07 15:59:50 +03:00
barisusakli	992e3128bd	closes #5499	2017-03-07 13:09:19 +03:00
RoiEX	33e474759b	Change var names	2017-03-06 21:00:20 +01:00
RoiEX	6420e22453	Remove uneccessary curly brackets	2017-03-06 20:43:06 +01:00
RoiEX	fcda832052	Add spaces	2017-03-06 20:39:26 +01:00
RoiEX	0f9530bbc0	Shrink JSON fix	2017-03-06 20:24:00 +01:00
RoiEX	f1b4a9b786	Shrink JSON	2017-03-06 20:23:34 +01:00
RoiEX	186c1f40e9	Refactor Code	2017-03-06 20:07:06 +01:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00
barisusakli	e85e35cf0c	closes #5497	2017-03-05 00:46:18 +03:00
barisusakli	a3b4c83e8b	remove description from categories ... it gets added in src/meta/tags	2017-03-03 19:59:37 +03:00
barisusakli	ea871384d8	remove fallbacks	2017-03-03 16:45:18 +03:00
barisusakli	3b8d14bf12	closes #5493	2017-03-03 16:15:01 +03:00
barisusakli	54c951cc81	fix tests	2017-03-02 22:12:56 +03:00
barisusakli	4369a6d290	more user tests	2017-03-02 21:58:33 +03:00
barisusakli	bce1208e2f	make uploadFile public	2017-03-02 20:51:03 +03:00
barisusakli	b1b87d339f	more refactors	2017-03-02 16:11:11 +03:00
barisusakli	bc8d297377	move out error and 404 controllers	2017-03-02 14:57:33 +03:00
barisusakli	2188036148	controllers/users refactor	2017-03-02 00:14:30 +03:00
barisusakli	566ff95d3c	call methods directly	2017-03-01 23:22:17 +03:00