Emmanuel Papin
|
9929233e75
|
Merge branch 'master' into plugin_support_test
Conflicts:
configure.ac
web/lang/fr_fr.php
|
2015-02-25 23:14:25 +01:00 |
Andy Bauer
|
9f3ff787d1
|
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
|
2015-02-18 18:53:47 -06:00 |
|
Emmanuel Papin
|
d961831355
|
Fix conflict when merging upstream master
|
2014-12-13 19:54:54 +01:00 |
Isaac Connor
|
593f0781d6
|
this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS
|
2014-11-26 11:57:35 -05:00 |
|
manupap1
|
eae1357a45
|
Support plugins in web user interface
|
2014-11-12 00:53:53 +01:00 |
Jan M. Hochstein
|
0a2515c00e
|
Added basic ONVIF support
|
2014-07-14 20:36:18 +02:00 |
stan
|
6ff385e407
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-06-21 09:19:10 +00:00 |
|
stan
|
62503acd16
|
Added monitor probe facility
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2829 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-03-31 13:00:49 +00: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
|
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 |