mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-30 17:11:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,318 Commits 66 Branches 101 Tags
c9dc53b23796600a6464d7fdef9beb79d6e235fc
Commit Graph

892 Commits

Author SHA1 Message Date
Isaac Connor
c9dc53b237 add in find and find_one 2015-12-22 11:50:08 -05:00
Isaac Connor
3d00c3a50d Make getDiskPercent take an optional path. When a Server is specified, add it to the Filter object so that we can use in getDiskPercent 2015-12-21 11:34:12 -05:00
Isaac Connor
710197a4f2 Merge branch 'filter_object' into storageareas 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
	scripts/zmfilter.pl.in
 2015-12-21 11:27:48 -05:00
Isaac Connor
de83872671 id => Id 2015-12-21 11:25:38 -05:00
Isaac Connor
9f02f4353c it is important to return the object from the constructor 2015-12-21 11:13:01 -05:00
Isaac Connor
e7c337f9f3 fix namespace for dbh 2015-12-21 11:10:45 -05:00
Isaac Connor
30353fbcf9 Add special case for Server Attr's because they are on the Monitor, not the event 2015-12-21 10:33:19 -05:00
Isaac Connor
5553760222 Add special cases for ServerId, ServerName, ServerHost to handle supplying the value of the host that the script is running on. 2015-12-21 10:23:37 -05:00
Isaac Connor
c71d1e52ac Fix 2015-12-17 13:13:04 -05:00
Isaac Connor
9db9d243f2 Fix 2015-12-17 13:12:37 -05:00
Isaac Connor
6f34022613 add find and find_one routines 2015-12-17 13:11:32 -05:00
Isaac Connor
7a979bb891 remove duplicated routines 2015-12-17 13:11:15 -05:00
Isaac Connor
64f65b55cc use new Filter object to do some of the heavy lifting in zmfilter.pl 2015-12-17 12:57:14 -05:00
Isaac Connor
7365c053e6 Create a Filter object, out of some of the code in zmfilter.pl. The purpose is to be able to use it elsewhere like zmvideo.pl. 2015-12-17 12:56:40 -05:00
Isaac Connor
3121e5550c Create a new class Storage and use it to handle figureing out where the event is actually stored. 2015-12-17 10:47:47 -05:00
Isaac Connor
39e396eb6e Merge branch 'master' into multi-server 2015-12-09 10:36:51 -05:00
Isaac Connor
ac23efebef Merge pull request #1184 from ZoneMinder/TV-IP862_new_firmware 
Add code to detect the change in REALM from older to newer firmware
 2015-12-09 10:36:27 -05:00
Isaac Connor
7c298c58ed Add code to detect the change in REALM from older to newer firmware 2015-12-08 16:20:38 -05:00
SteveGilvarry
5390605797 Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version 2015-12-03 10:23:19 +11:00
Isaac Connor
4d6c4355db Merge branch 'master' into multi-server 2015-11-20 16:07:50 -05:00
Isaac Connor
d231ac4533 remove comment at end of line 2015-11-10 14:46:12 -05:00
Isaac Connor
44168ce05e Merge branch 'master' into multi-server 2015-10-30 11:29:03 -04:00
Kyle Johnson
1cce60f6ec Update version check URL 2015-10-23 11:45:32 -06:00
Isaac Connor
582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00
Isaac Connor
1367de292e Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set 2015-10-07 08:57:50 -04:00
Isaac Connor
79d8e4b74f Merge branch 'master' into fix_zmaudit 2015-10-06 09:30:32 -04:00
Isaac Connor
4a506368dc Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field 2015-10-06 09:30:10 -04:00
Pliable Pixels
e0e048fe7e fixed version compare logic 2015-10-04 09:10:05 -04:00
Isaac Connor
aa108eff6e Add Info line on startup saying which Server it is loading for 2015-10-02 12:33:09 +00:00
Isaac Connor
b0b69c5176 parse ZM_SERVER_HOST into ZM_SERVER 2015-10-02 12:32:41 +00:00
Isaac Connor
ea87ffe66f merge master, bump version to 1.28.108 2015-10-01 11:52:49 -04:00
Bobby Billingsley
4eb4bdbfb5 Added control script for SunEyes SP-P1802SWPTZ 
(http://www.amazon.com/SunEyes-SP-P1802SWPTZ-Wireless-Camera-1080P/dp/B00MOTBXK6)
 2015-09-30 13:39:50 +02:00
Isaac Connor
e4b0e74f69 merge master 2015-09-24 10:01:27 -04:00
Isaac Connor
d754239a51 add debug statements for when LastWriteTime is not defined. 2015-09-24 09:57:58 -04:00
Isaac Connor
4c2545a5ca Merge branch 'master' into multi-server 2015-09-17 15:39:26 -04:00
Isaac Connor
6e3c8bb380 revert 2015-09-14 15:15:44 -04:00
Isaac Connor
204f2b1e22 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-09-10 13:20:06 -04:00
Isaac Connor
31ad75dea9 only add -h hostname to mysql command if it is defined. This helps support local unix-socket mysql access 2015-09-10 13:04:52 -04:00
Pliable Pixels
73fa051ef8 Google recaptcha 2015-08-29 13:29:52 -04:00
Isaac Connor
9cdf8ec317 tabs to spaces 2015-08-27 11:13:44 -04:00
Isaac Connor
80a294da34 tabs to spaces 2015-08-27 11:10:13 -04:00
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
Pliable Pixels
b4e9a0f0cf whitespacing 2015-08-26 12:08:10 -04:00
Pliable Pixels
46bd7b492b adds sanity checks to isActive and default states 2015-08-26 11:20:58 -04:00
Isaac Connor
41637278c9 merge master 2015-08-19 16:08:12 -04:00
Isaac Connor
5a363273a2 Merge branch 'master' into multi-server 
Conflicts:
	distros/ubuntu1504/changelog
 2015-07-16 16:37:44 -04:00
Andrew Bauer
10adae3696 Merge pull request #941 from ZoneMinder/trigger_on_space 
add space instead of + to handle old Axis cameras
 2015-07-16 13:09:36 -05:00
Isaac Connor
ad23969982 add space instead of + to handle old Axis cameras 2015-07-16 13:06:15 -04:00
Dmitry Smirnov
c788d70b93 zmtrigger: POD documentation 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-07-16 18:35:42 +10:00
Isaac Connor
ca9a391d62 Only load the monitors for our server 2015-07-15 16:24:01 -04:00