6434 Commits

Author	SHA1	Message	Date
Julian Lam	7afe8a32f6	Merge branch 'master' into develop	2017-03-29 15:26:49 -04:00
Misty (Bot)	e9794224a8	Latest translations and fallbacks	2017-03-29 09:24:44 +00:00
Julian Lam	5fbbe898d0	fixes #5538	2017-03-28 12:17:20 -04:00
Julian Lam	1594a84e1c	fixes #5536	2017-03-28 12:13:44 -04:00
Misty (Bot)	8d4a32dc27	Latest translations and fallbacks	2017-03-28 09:24:51 +00:00
Julian Lam	c34b10dd50	Merge branch 'master' into develop	2017-03-27 14:38:27 -04:00
Julian Lam	15506c30a4	updates es search translation	2017-03-27 14:38:13 -04:00
Misty (Bot)	c1c96668af	Latest translations and fallbacks	2017-03-27 09:24:50 +00:00
Misty (Bot)	2a2ed96a07	Latest translations and fallbacks	2017-03-26 09:24:22 +00:00
Misty (Bot)	114f87e78c	Latest translations and fallbacks	2017-03-25 09:22:16 +00:00
Julian Lam	b649eb95f8	Merge remote-tracking branch 'origin/master' into develop	2017-03-24 14:37:39 -04:00
Misty (Bot)	3319a72679	Latest translations and fallbacks	2017-03-24 09:22:18 +00: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
Julian Lam	4b3dcd1a02	Merge remote-tracking branch 'origin/master' into develop	2017-03-22 09:18:20 -04: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
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	c805d55b85	creating notification for flag assignment	2017-03-17 13:16:16 -04: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
Misty (Bot)	2106050bdc	Latest translations and fallbacks	2017-03-14 09:22:41 +00: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
Misty (Bot)	9f1a2b0cc9	Latest translations and fallbacks	2017-03-12 09:22:16 +00:00
Misty (Bot)	3e93975595	Latest translations and fallbacks	2017-03-11 09:22:17 +00: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	5ca9e5e14c	ACP: distinguish <small> from regular text	2017-03-10 14:36:35 -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	debe34b96c	better styling for tagsinput in ACP and added it to general -> keywords	2017-03-10 14:25:37 -05: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
Misty (Bot)	dc4d394cd5	Latest translations and fallbacks	2017-03-10 09:22:19 +00:00
psychobunny	8da8e4d8c3	closes #5469	2017-03-09 16:50:26 -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
Julian Lam	f35bf91e3b	Merge branch 'master' into develop	2017-03-08 09:20:00 -05:00
barisusakli	6f49509645	fix newSet on redis	2017-03-08 15:09:58 +03:00
Misty (Bot)	92ad6bb4e8	Latest translations and fallbacks	2017-03-08 09:22:29 +00: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