12 Commits

Author	SHA1	Message	Date
barisusakli	0e7740af32	fix tests for subfolder installs	2017-02-25 16:04:04 +03:00
Julian Lam	e71bd7a27f	Merge branch 'master' into styleguide	2017-02-24 11:45:04 -05:00
barisusakli	04b07e292c	thumb tests	2017-02-24 17:34:34 +03:00
Peter Jaszkowiak	dd2b930824	Resolve merge conflicts, minify only .js files	2017-02-23 18:31:49 -07:00
barisusakli	ef90702049	closes #5459	2017-02-20 21:28:02 +03:00
Peter Jaszkowiak	896c8c7343	ESlint object-curly-spacing	2017-02-18 12:30:49 -07:00
Peter Jaszkowiak	3b0dd2d1ef	ESlint padded-blocks	2017-02-18 02:32:24 -07:00
Peter Jaszkowiak	52f2028206	ESlint no-multiple-empty-lines	2017-02-17 22:08:23 -07:00
Peter Jaszkowiak	bc1d70c126	ESlint comma-dangle	2017-02-17 19:31:21 -07:00
Peter Jaszkowiak	aaacdb8413	Fix #5416, uploads path config setting ... - Finish moving uploads route to `/assets/uploads` - Remove `upload_url` config setting, it was broken	2017-02-08 11:41:34 -07:00
barisusakli	2cc2e7688a	more tests	2016-11-07 14:45:49 +03:00
barisusakli	64a662ce50	some upload tests	2016-11-01 17:33:24 +03:00