Isaac Connor f7cc2fb44f Merge branch 'master' into multi-server ...

Conflicts:
	src/zm_monitor.cpp

2015-11-23 10:42:14 -05:00

..

Config

merge master

2015-09-24 10:01:27 -04:00

Console

Moved the api to underneath the web directory

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

Controller

Merge pull request #1136 from pliablepixels/1135-events-API-prev-next

2015-11-16 09:23:36 -07: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

use deleteAll() vs. delete() when deleting an Event's Frames

2015-09-30 13:53:23 -06: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

Merged Angular UI branch API to master

2015-06-11 02:58:58 +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

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