11415 Commits

Author	SHA1	Message	Date
RoiEX	eca150f392	Fix Tests	2017-03-05 15:10:35 +01:00
RoiEX	f761191fca	Add OSD	2017-03-05 14:45:30 +01:00
barisusakli	e85e35cf0c	closes #5497	2017-03-05 00:46:18 +03:00
barisusakli	324e5be7bd	privileges tests	2017-03-03 21:04:01 +03:00
barisusakli	a3b4c83e8b	remove description from categories ... it gets added in src/meta/tags	2017-03-03 19:59:37 +03:00
barisusakli	ea871384d8	remove fallbacks	2017-03-03 16:45:18 +03:00
barisusakli	3b8d14bf12	closes #5493	2017-03-03 16:15:01 +03:00
barisusakli	54c951cc81	fix tests	2017-03-02 22:12:56 +03:00
barisusakli	4369a6d290	more user tests	2017-03-02 21:58:33 +03:00
barisusakli	bce1208e2f	make uploadFile public	2017-03-02 20:51:03 +03:00
barisusakli	cd448f90cd	more topic tests	2017-03-02 19:03:49 +03:00
barisusakli	202bafa3e3	add images to bundle	2017-03-02 18:21:01 +03:00
barisusakli	b060bda8a0	some more refactors	2017-03-02 17:25:32 +03:00
barisusakli	b1b87d339f	more refactors	2017-03-02 16:11:11 +03:00
barisusakli	bc8d297377	move out error and 404 controllers	2017-03-02 14:57:33 +03:00
barisusakli	2188036148	controllers/users refactor	2017-03-02 00:14:30 +03:00
barisusakli	566ff95d3c	call methods directly	2017-03-01 23:22:17 +03:00
barisusakli	3e396a8553	sitemap refactor	2017-03-01 23:19:34 +03:00
barisusakli	1bee91fa22	groups refactor	2017-03-01 22:42:16 +03:00
psychobunny	2ccf60a6ec	fixed duplicate uninstall button	2017-03-01 13:49:55 -05:00
Julian Lam	67e8bab783	Merge branch 'develop' into upgrades-refactor	2017-03-01 12:12:04 -05:00
Julian Lam	15665d0872	re-ordered upgrade scripts so schemaDate is saved properly	2017-03-01 12:11:05 -05:00
Julian Lam	b85dcb2570	lint	2017-03-01 11:28:07 -05:00
Julian Lam	48fc74f1fa	Merge branch 'develop' into upgrades-refactor ... re-added upgrade scripts from #5464	2017-03-01 11:11:40 -05:00
Julian Lam	7c21152f2e	Merge remote-tracking branch 'origin/master' into develop	2017-03-01 10:55:15 -05:00
Barış Soner Uşaklı	fecdbc969f	fix set call	2017-03-01 17:47:59 +02:00
Barış Soner Uşaklı	c5f40e3cf5	fix indents	2017-03-01 17:42:50 +02:00
Barış Soner Uşaklı	6222b55dd8	Merge branch 'master' into assets-images-upgrade	2017-03-01 17:40:44 +02:00
barisusakli	ac84e447dc	closes #5492	2017-03-01 17:37:17 +03:00
Peter Jaszkowiak	b96b983552	Upgrade script for prepending /assets in config ... Fix for sound settings upgrade script to upgrade user sound settings even if admin settings weren't set	2017-02-28 13:57:24 -07:00
Julian Lam	a8dd794697	reapply ef93ef3dd4	2017-02-28 14:04:44 -05:00
Julian Lam	513f72c0e9	Merge branch 'develop' into upgrades-refactor	2017-02-28 12:35:48 -05:00
Julian Lam	45c479a101	Merge branch 'master' into develop	2017-02-28 12:07:56 -05:00
barisusakli	2e47cf4db3	intersititial test	2017-02-28 16:42:10 +03:00
barisusakli	8a0cf6c0ac	more admin socket tests	2017-02-28 15:16:49 +03:00
barisusakli	bb1045c5a0	remove unused require	2017-02-28 12:29:49 +03:00
barisusakli	ef93ef3dd4	if user does not have settings object skip	2017-02-28 12:23:42 +03:00
psychobunny	06eabbc507	typo	2017-02-27 17:07:17 -05:00
psychobunny	7bdbe7d9db	wrong date	2017-02-27 17:04:36 -05:00
psychobunny	5d9b6062d6	simpler method for getting pids	2017-02-27 17:03:40 -05:00
psychobunny	86a8b8ab93	posts:votes sorted set	2017-02-27 15:27:07 -05:00
Julian Lam	1c9cbc3365	Merge branch 'develop' into upgrades-refactor	2017-02-27 12:19:58 -05:00
barisusakli	feb359f7d4	closes #5479	2017-02-27 20:16:44 +03:00
Julian Lam	4a851e0a85	Merge branch 'master' into develop	2017-02-27 12:15:48 -05:00
Julian Lam	8166f30b90	abort sound upgrade if no sounds set in config	2017-02-27 12:15:38 -05:00
Julian Lam	022823f57c	Merge branch 'master' into develop	2017-02-27 10:16:27 -05:00
Julian Lam	039f80c5aa	added null check for #5482	2017-02-27 10:16:16 -05:00
Julian Lam	8f5d1ca4da	added null check for #5482	2017-02-27 10:15:44 -05:00
Julian Lam	23a0881311	Merge branch 'develop' into upgrades-refactor ... Also handled upgrade script introduced in #5482	2017-02-27 10:10:15 -05:00
Julian Lam	58cbf44143	Merge branch 'master' into develop	2017-02-27 10:05:20 -05:00