4438 Commits

Author	SHA1	Message	Date
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
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	980e9026f3	Fix #5588, translator ignores unclosed tokens	2017-04-12 20:34:31 -06:00
Peter Jaszkowiak	9368e666d8	Fix failing test	2017-04-11 21:53:17 -06:00
Peter Jaszkowiak	010473e5cc	Merge branch 'master' into patch-pitaj	2017-04-09 23:09:52 -06:00
Peter Jaszkowiak	dc4f2be156	Remove ace global for eslint	2017-04-09 21:47:05 -06:00
Julian Lam	126237e2c9	Merge pull request #5576 from pichalite/zxcvbn ... Closes #5521	2017-04-09 16:52:52 -04: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	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
pichalite	4c89497cc4	Closes #5521	2017-04-07 20:57:00 +00:00
Anil Mandepudi	da183e196a	Fixes #5572 (#5575) ... * Fixes #5572 * Adding trailing commas but in protest	2017-04-07 14:35:24 -04:00
Peter Jaszkowiak	1deeaaeb39	Fix #5563	2017-04-06 15:20:07 -06:00
Julian Lam	7afe8a32f6	Merge branch 'master' into develop	2017-03-29 15:26:49 -04:00
Julian Lam	1594a84e1c	fixes #5536	2017-03-28 12:13:44 -04:00
Julian Lam	b649eb95f8	Merge remote-tracking branch 'origin/master' into develop	2017-03-24 14:37:39 -04:00
Julian Lam	6060b8e13b	fix tests	2017-03-23 14:39:46 -04:00
Barış Soner Uşaklı	fe27d40ff6	closes #5542	2017-03-23 10:58:28 +03:00
Aziz Khoury	6682e048ea	wrapImagesInLinks with <a download> attribute ... if the `src` of the `img` does not have an extension, most browsers will trigger a download with whatever filename is set, also without an extension, so when it's opened in any OS, it wont have a default application to open it with. So, In this case, if the `alt` attribute has an extension (meaning if it looks like filename) - we use that with the html5 [`download` attr](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-download) The PR does not affect any src if they have an extension.	2017-03-22 12:19:31 +02:00
Julian Lam	7f8f197e60	Merge branch 'master' into develop	2017-03-16 14:58:39 -04:00
Julian Lam	23d4497c73	Merge pull request #5531 from NodeBB/patch_5491 ... Fix #5491	2017-03-15 23:01:42 -04:00
Peter Jaszkowiak	8c45411ccc	Fix #5491	2017-03-15 20:00:05 -07:00
Julian Lam	250bb4b011	fixed leftover merge conflict artifact	2017-03-15 10:23:25 -04:00
Julian Lam	1ebbbdd3f9	Merge remote-tracking branch 'origin/master' into develop	2017-03-15 10:01:00 -04:00
barisusakli	6a4b082080	closes #5524	2017-03-15 12:19:09 +03:00
barisusakli	5a2ff8ed0a	closes #5527	2017-03-14 23:03:09 +03:00
Julian Lam	6d444ccacf	Merge pull request #5526 from NodeBB/patch_5346 ... Fix #5346	2017-03-14 09:52:42 -04:00
Peter Jaszkowiak	c199075d98	Fix #5346	2017-03-13 20:20:41 -07:00
Barış Soner Uşaklı	0396e9300b	Merge pull request #5500 from RoiEXLab/fix-admin-search ... Fix admin Search	2017-03-13 09:58:30 +02:00
Julian Lam	860999fa6c	Merge remote-tracking branch 'origin/master' into develop	2017-03-10 15:44:29 -05:00
psychobunny	286d0ab203	prevent tagsinput initialization from flagging as unsaved	2017-03-10 14:40:10 -05:00
psychobunny	62f445ad7f	ACP: added tagsinput to other fields that are "comma separated"	2017-03-10 14:36:35 -05:00
barisusakli	bb146e049c	fix lint	2017-03-10 22:36:09 +03:00
psychobunny	447b7b02ca	use tagsinput for #5439 instead	2017-03-10 14:12:17 -05:00
psychobunny	f2eb4b8083	closes #5439	2017-03-10 14:03:07 -05:00
psychobunny	a67d48e719	#5513 (#5520) ... closes #5513	2017-03-10 12:50:19 -05:00
psychobunny	fd8e647ef5	closes #5506	2017-03-09 16:47:07 -05:00
barisusakli	f092b7754e	only create 1 alert for chat spam error	2017-03-08 22:43:02 +03:00
barisusakli	6f49509645	fix newSet on redis	2017-03-08 15:09:58 +03:00
Julian Lam	04b66787ea	removed hardcoded stepsize of 1 for chart, so it can space the ticks out properly	2017-03-07 20:53:54 -05:00
Julian Lam	793555a344	Merge branch 'master' into develop	2017-03-07 14:35:49 -05:00
barisusakli	1301fb1f34	on chat leave close the modal	2017-03-07 19:51:52 +03:00
barisusakli	8a123f7c1c	closes #5509	2017-03-07 16:13:09 +03:00
barisusakli	69c6ee5834	closes #5483	2017-03-07 13:38:31 +03:00
barisusakli	992e3128bd	closes #5499	2017-03-07 13:09:19 +03:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00