ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/web/api/app
History
Isaac Connor 75919c9cd5 Merge branch 'master' into multi-server 
Conflicts:
	docs/installationguide/ubuntu.rst
	misc/apache.conf.in
	src/zm_monitor.cpp
 		2015-08-27 10:34:47 -04:00
..
Config Merge branch 'master' into multi-server 2015-08-27 10:34:47 -04:00
Console Moved the api to underneath the web directory 2014-04-29 20:41:04 +00:00
Controller Merge pull request #1008 from pliablepixels/993-API-Auth 2015-08-11 14:51:02 -05: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 Merged Angular UI branch API to master 2015-06-11 02:58:58 +00: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 Merged Angular UI branch API to master 2015-06-11 02:58:58 +00: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