523 Commits

Author	SHA1	Message	Date
Baris Usakli	9979987342	perserve hash when switching categories	2017-06-28 13:52:46 -04: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	88d5f97280	closes #5717	2017-05-29 17:12:02 -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
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	816809ce3c	fixes #5606	2017-05-11 16:53:35 -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ı	3a1eba2537	merge	2017-05-08 13:49:35 -04:00
Peter Jaszkowiak	65e31493a9	Escape ACP search values	2017-04-24 11:40:39 -06:00
barisusakli	236758b712	Merge remote-tracking branch 'refs/remotes/origin/master' into develop	2017-04-18 14:00:14 -04:00
barisusakli	20eac0de94	closes #5518	2017-04-17 12:23:05 -04:00
barisusakli	e3205bcfad	merge	2017-04-16 14:26:12 -04:00
Peter Jaszkowiak	baa2a59f4c	Fix ace editor not working	2017-04-15 16:10:28 -06:00
Julian Lam	d18cfced96	Merge remote-tracking branch 'origin/master' into develop	2017-04-12 23:57:14 -04:00
Peter Jaszkowiak	484a800327	Merge branch master into develop	2017-04-12 21:11:39 -06:00
Peter Jaszkowiak	9368e666d8	Fix failing test	2017-04-11 21:53:17 -06:00
Peter Jaszkowiak	dc4f2be156	Remove ace global for eslint	2017-04-09 21:47:05 -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
Peter Jaszkowiak	1deeaaeb39	Fix #5563	2017-04-06 15:20:07 -06: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
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
psychobunny	447b7b02ca	use tagsinput for #5439 instead	2017-03-10 14:12:17 -05:00
RoiEX	c517733e34	Fix admin Search	2017-03-05 11:38:40 +01: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	72e77772db	Merge branch 'master' into develop	2017-02-24 12:46:40 -05: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
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
Peter Jaszkowiak	b227297ef3	ESlint no-use-before-define	2017-02-18 18:55:33 -07:00
Peter Jaszkowiak	93f38d4f30	ESlint no-multi-assign ... and max-nested-callbacks, no-mixed-requires, max-statements-per-line	2017-02-18 18:06:28 -07:00
Peter Jaszkowiak	4bb49a7171	ESlint no-unused-vars	2017-02-18 15:05:36 -07:00
Peter Jaszkowiak	c18808fdeb	ESlint no-useless-concat, no-mixed-spaces-and-tabs	2017-02-18 14:42:15 -07:00
Peter Jaszkowiak	fdf4f873bf	ESlint eqeqeq ... and require-jsdoc, no-negated-condition	2017-02-18 14:36:16 -07:00
Peter Jaszkowiak	09e868ce5f	ESlint no-useless-escape, no-else-return	2017-02-18 14:27:26 -07:00