Commit Graph

11 Commits

Author SHA1 Message Date
Emmanuel Papin d961831355 Fix conflict when merging upstream master 2014-12-13 19:54:54 +01:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
manupap1 eae1357a45 Support plugins in web user interface 2014-11-12 00:53:53 +01:00
Andrew Bauer 35468af815 Merge pull request #338 from m-bene/extendPreclusive
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
m-bene 26777487dc add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
Isaac Connor 3393a63525 more updates 2013-12-17 12:53:15 -05:00
Isaac Connor 36c4fad644 remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -04:00
stan ef8f7b85fd Continuing development and bugfixes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:47:20 +00:00
stan ba788cc001 Fixed issues with creation, editing and deletion of monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 16:43:34 +00:00
stan 106882c161 Updated copyright notices
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00