Isaac Connor 7d90a56561 Merge branch 'master' into storageareas

2018-11-30 14:46:42 -05:00

..

Component

disable FilterComponent as it doesn't actually do anything. Add Groups join when needed

2017-12-09 14:03:42 -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

Merged Angular UI branch API to master

2015-06-11 02:58:58 +00:00

EventsController.php

fix_2167 (#2168)

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

FramesController.php

Moved the api to underneath the web directory

2014-04-29 20:41:04 +00:00

GroupsController.php

Merge ../ZoneMinder.master into storageareas

2018-03-06 12:29:59 -05:00

HostController.php

resolves #2327

2018-11-29 09:21:10 -05:00

LogsController.php

Merged Angular UI branch API to master

2015-06-11 02:58:58 +00:00

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

add in User Model/Controller and rough in auth.

2015-06-30 11:27:17 -04:00

ZonePresetsController.php

fix spacing/quotes/google code style

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

ZonesController.php

fix_2167 (#2168)

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