Isaac Connor 513de21260 Merge branch 'add_api_auth' into storageareas		2016-06-21 09:10:06 -04:00
..
Config	Merge branch 'improve_filter' into storageareas	2016-05-27 09:57:05 -04:00
Console	Merge h264	2016-03-31 11:03:36 -04:00
Controller	fix warnings and move User import up higher to where it needs to be	2016-06-21 09:09:58 -04:00
Lib	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
Locale/eng/LC_MESSAGES	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
Model	rough in Server object support	2016-05-02 10:41:25 -04:00
Plugin	Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp	2015-08-18 14:07:38 -05:00
Test	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
Vendor	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00
View	rough in Server object support	2016-05-02 10:41:25 -04:00
vendor	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
webroot	Merged Angular UI branch API to master	2015-06-11 02:58:58 +00:00
.htaccess	Added API routing	2015-07-13 18:55:28 +00:00
index.php	Moved the api to underneath the web directory	2014-04-29 20:41:04 +00:00