13 Commits

Author	SHA1	Message	Date
Peter Jaszkowiak	484a800327	Merge branch master into develop	2017-04-12 21:11:39 -06:00
psychobunny	53dac97800	closes #5560	2017-04-03 12:42:36 -04:00
Julian Lam	d75cc60e76	added upgrade.check back into upgrade.js	2017-02-26 15:53:25 -05:00
Peter Jaszkowiak	23540afaeb	Resolve merge conflicts	2017-02-18 19:14:39 -07:00
Barış Soner Uşaklı	1b43faba1a	closes #5441	2017-02-19 02:44:38 +03:00
Peter Jaszkowiak	1493afee2a	ESlint indent	2017-02-18 02:38:03 -07:00
Peter Jaszkowiak	604358ecc4	ESlint keyword-spacing, no-multi-spaces	2017-02-18 01:52:56 -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
Dominic Lennon	04e5707143	Fixing lint issues	2017-01-11 11:24:27 +00:00
Dominic Lennon	d248ef95cd	Fix for issue #5334. SessionStore now uses the correct value	2017-01-10 11:48:27 +00:00
barisusakli	c927eb15d7	fix requires	2016-12-23 15:37:18 +03:00
barisusakli	c36e2aa13d	refactor app.js/start	2016-12-23 14:45:37 +03:00