1062 Commits

Author	SHA1	Message	Date
Baris Usakli	bc0645dc26	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-08-16 15:17:26 -04:00
Baris Usakli	5a968730d5	closes #5880	2017-08-15 14:43:43 -04:00
Baris Usakli	f1f8a587d4	Merge remote-tracking branch 'refs/remotes/origin/master' into develop ... # Conflicts: # package.json	2017-07-13 15:02:23 -04:00
Barış Soner Uşaklı	bca79da8c6	closes #4197 ... add in-topic search support to dbsearch prevent multiple click handlers on in-topic search widget(each click was causing multiple scrolls) fix index	2017-07-12 19:29:41 -04:00
Julian Lam	c2f1d254cc	Merge branch 'master' into develop	2017-07-10 16:36:09 -04:00
Barış Soner Uşaklı	34d9b57b26	fix wrong function name, change dom to data @julianlam	2017-07-07 18:12:42 -04:00
Julian Lam	3ddf332e0c	added two new client-side hooks for search to allow plugins to add fields	2017-07-07 15:48:35 -04:00
Julian Lam	77ec169591	added two new client-side hooks for search to allow plugins to add fields	2017-07-07 15:48:01 -04:00
Baris Usakli	7538210b07	#5772 ... load correct timeago settings on cold load instead of after page load	2017-07-06 14:09:59 -04:00
Julian Lam	3f2c183cbd	Merge branch 'master' into develop	2017-07-04 10:39:51 -04:00
Peter Jaszkowiak	f1c955e6fc	Fix scrollStop not working sometimes	2017-06-30 23:38:52 -06:00
Baris Usakli	5167c1aa4f	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-28 14:19:29 -04:00
Baris Usakli	4890731444	don't error if topicsContainer is not set	2017-06-27 14:34:37 -04:00
Baris Usakli	e8bff210c9	clear selectedCategory on init	2017-06-27 11:38:09 -04:00
Barış Soner Uşaklı	b64ba40c67	closes #5772	2017-06-26 17:27:48 -04:00
Julian Lam	e604d6e23e	closes #5768	2017-06-21 09:51:59 -04:00
Barış Soner Uşaklı	b13ed26587	closes #5755	2017-06-13 20:15:48 -04:00
Baris Usakli	8ea5c060f5	closes #5754	2017-06-13 15:20:31 -04:00
Peter Jaszkowiak	aefdc4b24b	Refactor helpers import/export	2017-05-31 16:23:28 -06:00
Baris Usakli	da8b1b605c	#5723	2017-05-30 17:21:34 -04:00
psychobunny	9cb5f71e08	#5717 also don't show category section in subcategory listing	2017-05-29 18:04:35 -04:00
Julian Lam	74965654de	adjusted cropbox max-height calculation to be dynamic	2017-05-24 14:50:22 -04:00
Julian Lam	3e218a75b8	allowed zooming again @pichalite	2017-05-24 14:15:19 -04:00
Julian Lam	30bec51a21	removed cropper zoom and using image scaling to show entire image. Click on modal backdrop during crop will no longer close modal	2017-05-24 12:36:58 -04:00
Peter Jaszkowiak	542ae5e71f	Extract in-place translation from bootbox wrapper for use anywhere	2017-05-23 15:41:27 -04:00
Barış Soner Uşaklı	29c0b8337e	closes #5645	2017-05-10 14:43:52 -04:00
Barış Soner Uşaklı	3a1eba2537	merge	2017-05-08 13:49:35 -04:00
Barış Soner Uşaklı	986e52897d	fix crash if locale is undefined	2017-05-04 14:09:44 -04:00
Peter Jaszkowiak	81e23a8a9a	Fix #5622	2017-04-23 12:48:35 -06:00
Barış Soner Uşaklı	081578c7f4	Merge pull request #5616 from NodeBB/auto-lang ... Automatically detect user language based on browser accepts header	2017-04-22 12:58:54 -04:00
Peter Jaszkowiak	64bf542d17	Fix HTML lang attribute using the defaultLang ... Themes need `lang="{function.localeToHTML, userLang, defaultLang}"` in their header.tpl file	2017-04-21 23:56:19 -06:00
Barış Soner Uşaklı	c43a4e4b82	Merge pull request #5615 from NodeBB/fix-5536 ... Fix #5536	2017-04-21 23:33:15 -04:00
barisusakli	08dd412896	Merge remote-tracking branch 'refs/remotes/origin/master' into develop ... # Conflicts: # src/upgrade.js	2017-04-21 21:43:39 -04:00
barisusakli	73700ed747	closes #5617	2017-04-21 13:48:43 -04:00
Peter Jaszkowiak	cc76a8663d	Add flag for detecting if the mock is being used	2017-04-19 20:44:11 -06:00
Peter Jaszkowiak	30b47d39f3	Fix #5536	2017-04-19 20:33:03 -06:00
Peter Jaszkowiak	9d8ff4ea3e	Fix images not displaying in signatures	2017-04-19 17:19:38 -06:00
barisusakli	236758b712	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-04-18 14:00:14 -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	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
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
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
Anil Mandepudi	da183e196a	Fixes #5572 (#5575) ... * Fixes #5572 * Adding trailing commas but in protest	2017-04-07 14:35:24 -04:00
Julian Lam	793555a344	Merge branch 'master' into develop	2017-03-07 14:35:49 -05:00
Julian Lam	af2d9fb85b	Merge branch 'master' into develop	2017-03-06 09:51:11 -05:00
Accalia de Elementia	743a7e00b4	fix: auto cropper on image upload selects maximum image area by default	2017-03-06 13:14:15 +00:00