8423 Commits

Author	SHA1	Message	Date
barisusakli	7b91da067b	closes #5602	2017-04-18 14:21:28 -04:00
barisusakli	236758b712	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-04-18 14:00:14 -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
Peter Jaszkowiak	2827db3309	Fix sounds playing through multiple tabs	2017-04-17 15:56:24 -06:00
barisusakli	56ba08f17e	fix require path	2017-04-17 14:31:24 -04:00
Julian Lam	82bfa752b9	Removed outdated list of available upgrade scripts	2017-04-16 15:47:32 -04:00
Julian Lam	542cf1a982	Merge remote-tracking branch 'origin/master' into develop	2017-04-16 15:45:16 -04:00
barisusakli	fdee61b4f4	use deleteMany instead	2017-04-16 15:42:28 -04:00
barisusakli	cf6c4667c8	upgrade script to clear sessions	2017-04-16 15:31:50 -04:00
barisusakli	38e16ca8f6	Merge branch 'master' into develop	2017-04-16 14:48:00 -04:00
barisusakli	65a65b19c0	tests for #5600	2017-04-16 14:46:02 -04:00
barisusakli	c3ac7c31b1	Merge branch 'master' into develop	2017-04-16 14:32:50 -04:00
barisusakli	185b6e5c8e	#5600	2017-04-16 14:31:49 -04:00
barisusakli	e3205bcfad	merge	2017-04-16 14:26:12 -04:00
barisusakli	9f8d80e3a4	closes #5600	2017-04-16 14:22:40 -04:00
Peter Jaszkowiak	37c4218184	Fix error if ./nodebb build isn't called before tests	2017-04-15 16:10:43 -06: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	552f850207	closes #2702	2017-04-14 14:56:39 -04:00
barisusakli	92343eb2e1	fix mongo setObject if key/value is empty string	2017-04-14 13:58:32 -04:00
barisusakli	da7bc5bb7a	test fix	2017-04-14 13:38:58 -04:00
barisusakli	e63559b6fd	closes #5484	2017-04-14 12:59:36 -04:00
barisusakli	b8c606cbbd	closes #5519	2017-04-14 10:08:50 -04:00
barisusakli	886768ba84	check both date and upgrade count	2017-04-13 19:04:22 -04:00
barisusakli	05e9e88a15	fix lint	2017-04-13 18:53:46 -04:00
barisusakli	1cf775a4b8	upgrade script fixes	2017-04-13 18:43:39 -04:00
barisusakli	520d6954c1	test node 7	2017-04-13 17:58:44 -04:00
barisusakli	f4b8cb7217	added missing return	2017-04-13 17:02:13 -04:00
barisusakli	6d1702c600	wait for calls to finish	2017-04-13 16:58:41 -04:00
Julian Lam	a141835cf8	Merge branch 'master' into develop	2017-04-13 16:45:46 -04:00
barisusakli	7ce6c1d0ad	closes #5571	2017-04-13 16:36:02 -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
Peter Jaszkowiak	a8add6477c	Fix merge conflicts	2017-04-12 21:29:54 -06: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	75d291183d	Fix using nodebb in other CWDs	2017-04-12 15:22:58 -06:00
Peter Jaszkowiak	010473e5cc	Merge branch 'master' into patch-pitaj	2017-04-09 23:09:52 -06:00
Peter Jaszkowiak	1892492505	Deprecate utils.walk, remove prototype modification	2017-04-08 21:02:06 -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
Peter Jaszkowiak	b53d3254dd	buzz is no longer used	2017-04-08 19:05:10 -06:00
Peter Jaszkowiak	2c418fd2af	Use npm bootstrap	2017-04-08 19:05:10 -06:00
Peter Jaszkowiak	0ef30e91ba	Use ace-builds npm package instead of vendor ... ace can be referenced as an r.js module, reduces acp bundle size	2017-04-08 19:05:10 -06:00
Peter Jaszkowiak	17ff8a4151	Enable passing paths as module sources	2017-04-08 19:05:10 -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
psychobunny	5985a8a7a3	closes #5574	2017-04-06 18:06:10 -04:00
Barış Soner Uşaklı	43f8678c7a	update local config immediately	2017-04-06 17:59:46 -04:00
psychobunny	e121a5a798	closes #5574	2017-04-06 17:57:01 -04:00