508 Commits

Author	SHA1	Message	Date
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
Peter Jaszkowiak	c4bdb72941	ESlint no-unneeded-ternary ... and no-extend-native, no-sequences	2017-02-18 12:59:46 -07:00
Peter Jaszkowiak	896c8c7343	ESlint object-curly-spacing	2017-02-18 12:30:49 -07:00
Peter Jaszkowiak	1493afee2a	ESlint indent	2017-02-18 02:38:03 -07:00
Peter Jaszkowiak	3b0dd2d1ef	ESlint padded-blocks	2017-02-18 02:32:24 -07:00
Peter Jaszkowiak	feb8405f95	ESlint eol-last	2017-02-18 02:30:48 -07:00
Peter Jaszkowiak	a038c66549	ESlint quotes	2017-02-18 01:56:23 -07:00
Peter Jaszkowiak	604358ecc4	ESlint keyword-spacing, no-multi-spaces	2017-02-18 01:52:56 -07:00
Peter Jaszkowiak	a5a3f3089a	ESlint no-mixed-operators	2017-02-18 01:51:11 -07:00
Peter Jaszkowiak	2e031f3759	ESlint comma-spacing	2017-02-18 01:31:47 -07:00
Peter Jaszkowiak	277a7fb8b4	ESlint key-spacing, no-trailing-spaces	2017-02-18 01:27:46 -07:00
Peter Jaszkowiak	34e233fe1d	ESlint spaced-comment	2017-02-18 01:25:46 -07:00
Peter Jaszkowiak	532951c24f	ESlint space-in-parens, block-spacing	2017-02-18 01:21:34 -07:00
Peter Jaszkowiak	b1b486f729	ESlint quote-props	2017-02-18 01:19:20 -07:00
Peter Jaszkowiak	3361a72725	ESlint no-plusplus ... and no-empty, space-unary-ops	2017-02-18 01:12:18 -07:00
Peter Jaszkowiak	d1101a7fb4	ESlint dot-notation ... and func-call-spacing	2017-02-18 00:21:44 -07:00