5262 Commits

Author	SHA1	Message	Date
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
Accalia de Elementia	743a7e00b4	fix: auto cropper on image upload selects maximum image area by default	2017-03-06 13:14:15 +00:00
barisusakli	531df7bd09	closes #5504	2017-03-06 13:54:43 +03:00
RoiEX	c517733e34	Fix admin Search	2017-03-05 11:38:40 +01:00
barisusakli	e85e35cf0c	closes #5497	2017-03-05 00:46:18 +03:00
barisusakli	202bafa3e3	add images to bundle	2017-03-02 18:21:01 +03:00
barisusakli	5ca8456340	move image code to client/topic/images	2017-03-02 18:11:31 +03:00
barisusakli	284485c885	check data.config	2017-03-02 10:51:05 +03:00
Julian Lam	58cbf44143	Merge branch 'master' into develop	2017-02-27 10:05:20 -05:00
Peter Jaszkowiak	007051c14c	Fix #5476	2017-02-25 19:51:49 -07:00
Julian Lam	b1ceec7571	Merge remote-tracking branch 'origin/master' into develop	2017-02-25 21:43:50 -05:00
barisusakli	347761173a	helpers tests	2017-02-25 15:10:23 +03:00
Julian Lam	6e7b505ea7	more linting	2017-02-24 12:55:31 -05:00
Julian Lam	ddea9f534e	running eslint again	2017-02-24 12:47:46 -05:00
Julian Lam	72e77772db	Merge branch 'master' into develop	2017-02-24 12:46:40 -05:00
Julian Lam	995f8296a4	linting	2017-02-24 12:03:47 -05:00
Julian Lam	e71bd7a27f	Merge branch 'master' into styleguide	2017-02-24 11:45:04 -05:00
barisusakli	048eb8a320	some helper tests	2017-02-24 18:06:23 +03:00
Peter Jaszkowiak	dd2b930824	Resolve merge conflicts, minify only .js files	2017-02-23 18:31:49 -07:00
Peter Jaszkowiak	ee9d7584e4	Fix test, misc	2017-02-23 17:29:08 -07:00
pichalite	1d5b3cc73f	ACP manage tags page UI changes	2017-02-23 20:45:05 +00:00
Julian Lam	a9f144230e	Merge branch 'master' into develop	2017-02-23 13:57:46 -05:00
psychobunny	7b7565ee8e	Merge pull request #5468 from pichalite/acp-groups ... ACP manage groups UI updates	2017-02-23 13:22:57 -05:00
Julian Lam	672d7352bb	Merge branch 'master' into develop	2017-02-23 12:32:03 -05:00
pichalite	dcb0f18422	ACP manage groups UI updates	2017-02-22 20:28:56 +00:00
Julian Lam	e887dda37a	Merge pull request #5461 from pichalite/image-dimension ... Use ACP profile image dimension setting in cropper	2017-02-22 14:53:40 -05:00
Julian Lam	e427f1663e	Merge pull request #5456 from NodeBB/sounds-refactor ... Sound system improvements	2017-02-21 16:14:58 -05:00