Isaac Connor 5060358870 Merge branch 'master' into storageareas

2018-12-29 09:56:53 -05:00

..

Component

remove ZM_DIR_IMAGES (#2374)

2018-12-29 09:52:58 -05:00

AppController.php

fix_2167 (#2168)

2018-08-08 09:59:46 -04:00

ConfigsController.php

Include values in /etc/zm files in viewByName

2018-06-25 15:43:01 -04:00

ControlsController.php

…

EventsController.php

remove ZM_DIR_IMAGES (#2374)

2018-12-29 09:52:58 -05:00

FramesController.php

…

GroupsController.php

Update permissions checking for Groups to not use session. Fixes #2353

2018-12-21 10:01:48 -05:00

HostController.php

make sure auth is regenerated each time we call this API (#2347)

2018-12-16 11:02:07 -05:00

LogsController.php

…

MonitorsController.php

fix missing daemons definition

2018-11-28 09:12:22 -05:00

PagesController.php

further merges from cakephp 2.10.8

2018-03-21 13:09:55 -04:00

ServersController.php

fix_2167 (#2168)

2018-08-08 09:59:46 -04:00

StatesController.php

We don't store all the permissions in the session anymore. We just use the global user object

2018-10-29 11:03:03 -04:00

StorageController.php

Don't include related models in Storage index

2018-10-29 14:40:05 -04:00

UsersController.php

…

ZonePresetsController.php

fix spacing/quotes/google code style

2018-07-24 16:41:09 -04:00

ZonesController.php

remove ZM_DIR_IMAGES (#2374)

2018-12-29 09:52:58 -05:00