5262 Commits

Author	SHA1	Message	Date
Barış Soner Uşaklı	7fe9366103	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-16 17:35:45 -04:00
Barış Soner Uşaklı	8f5f5eb56a	closes #5761	2017-06-16 12:55:29 -04:00
Baris Usakli	0ea4ee7dda	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-15 14:05:45 -04:00
Julian Lam	dbcc1517eb	fix chat links not working in flag details page	2017-06-14 15:24:43 -04:00
Barış Soner Uşaklı	d9e84b1db8	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-13 20:58:19 -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
Barış Soner Uşaklı	a16aa33c8d	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-06-12 16:12:48 -04:00
Barış Soner Uşaklı	1628c352fd	closes #5750	2017-06-12 13:33:30 -04:00
Barış Soner Uşaklı	38806fe07f	closes #5752	2017-06-12 12:53:16 -04:00
Baris Usakli	037a0e5239	closes #5742 ... also fix reverse infinite scroll when sorting is changed	2017-06-06 16:40:32 -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
Baris Usakli	d13eb52f39	closes #5722	2017-05-30 14:10:16 -04:00
psychobunny	9cb5f71e08	#5717 also don't show category section in subcategory listing	2017-05-29 18:04:35 -04:00
psychobunny	88d5f97280	closes #5717	2017-05-29 17:12:02 -04:00
psychobunny	22891215cd	Merge branch 'master' of https://github.com/NodeBB/NodeBB	2017-05-29 16:19:46 -04:00
psychobunny	179b11b7d2	ACP allow ctrl-click to open new in new tab when settings are unsaved	2017-05-29 15:34:09 -04:00
Baris Usakli	883b35243f	fix lint	2017-05-29 15:12:22 -04:00
Baris Usakli	1fa52267d4	Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/src/admin/manage/category.js	2017-05-29 14:48:25 -04:00
Baris Usakli	de5fe25e57	closes #5715	2017-05-29 14:47:01 -04:00
psychobunny	dcbe4864a9	fix bad merge / dupe code	2017-05-29 13:26:17 -04:00
Barış Soner Uşaklı	08aaabd33c	closes #5642	2017-05-27 23:32:55 -04:00
Baris Usakli	5af1161e09	fix eslint	2017-05-25 16:41:32 -04:00
psychobunny	82cab53508	fix digest scheduling information on cold load	2017-05-25 16:14:25 -04:00
psychobunny	1b98449686	closes #5704	2017-05-25 15:17:24 -04:00
Julian Lam	3e6d51fc5a	fixes #5606 :rage2:	2017-05-24 21:18:28 -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
Barış Soner Uşaklı	a513d98e1d	prevent timeago in future for new posts	2017-05-24 10:56:09 -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ı	29ca1dbf08	replies/reply fix	2017-05-19 17:14:46 -04:00
Barış Soner Uşaklı	70adcd64bc	#5667	2017-05-12 14:58:40 -04:00
Julian Lam	816809ce3c	fixes #5606	2017-05-11 16:53:35 -04:00
Baris Usakli	51a85031f7	utils tests	2017-05-11 16:31:16 -04:00
Julian Lam	064a8aa6d7	Allowing custom date range to be supplied in pageviews graph, closes #5541	2017-05-11 11:41:36 -04:00
Barış Soner Uşaklı	29c0b8337e	closes #5645	2017-05-10 14:43:52 -04:00
Barış Soner Uşaklı	17b57be835	Merge pull request #5661 from NodeBB/utils-rtrim ... Deprecate non-standard `String.prototype.rtrim`	2017-05-09 16:44:43 -04:00
Peter Jaszkowiak	2b2544a4b1	Deprecate non-standard String.prototype.rtrim	2017-05-09 14:37:35 -06:00
Julian Lam	87fbb44ca8	fixes #5660 properly	2017-05-09 15:01:02 -04:00
Julian Lam	6d392089e4	fixes #5660 - https://ecma-international.org/ecma-262/5.1/#sec-15.9.1.1	2017-05-09 14:52:11 -04:00
Barış Soner Uşaklı	f3deef4931	closes #5656	2017-05-08 19:54:53 -04:00
Barış Soner Uşaklı	3a1eba2537	merge	2017-05-08 13:49:35 -04:00
psychobunny	b3bd70235a	refactor ban messaging; add ban duration to message; use bootbox instead of alert	2017-05-05 19:31:49 -04:00
psychobunny	76a2b4800b	add back timeago.allowFuture so we can notify when a ban will expire	2017-05-05 19:20:37 -04:00
Barış Soner Uşaklı	5673769c8c	add back removed rtrim method	2017-05-05 12:28:41 -04:00
Barış Soner Uşaklı	670a5d9ca0	fix timestamp not showing for replies, remove allowFuture @julianlam	2017-05-04 14:37:03 -04:00
Barış Soner Uşaklı	986e52897d	fix crash if locale is undefined	2017-05-04 14:09:44 -04:00
psychobunny	6f8e7343e6	fix for "invalid date" re:threading when replying to yourself	2017-05-04 14:08:18 -04:00