mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-28 17:58:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,772 Commits 83 Branches 104 Tags
2d8a4794de3bfaddacb3fdacc4ef5f1e11ba7d4f
Commit Graph

604 Commits

Author SHA1 Message Date
Isaac Connor
99f9145cdd Fix SQL for loading events 2015-12-21 14:43:55 -05:00
Isaac Connor
892623ce63 Use * to grab all Event columns 2015-12-21 14:14:00 -05:00
Isaac Connor
0cb2d141a5 Fix dbh's 2015-12-21 13:16:07 -05:00
Isaac Connor
dfd7986c01 Merge branch 'master' into multi-server 
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
 2015-12-21 12:57:45 -05:00
Isaac Connor
5683210e42 Add missing ; 2015-12-21 12:42:00 -05:00
Isaac Connor
ca07b951cb Merge branch 'master' into newpointone 
Conflicts:
	docs/installationguide/ubuntu.rst
 2015-12-21 12:41:25 -05:00
Isaac Connor
2dfab0b408 Add delete and delete_files methods 2015-12-21 12:29:35 -05:00
Isaac Connor
872e5eff15 Merge branch 'multi-server' into newpointone 
Conflicts:
	web/lang/en_gb.php
	web/skins/classic/views/filter.php
 2015-12-21 11:35:16 -05:00
Isaac Connor
c2a857b498 Merge branch 'storageareas' into newpointone 2015-12-21 11:34:27 -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
118dc12ad5 id => Id 2015-12-21 11:25:17 -05:00
Isaac Connor
f6d52e77b9 it is important to return the object from the constructor 2015-12-21 11:13:21 -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
ac88867fd2 fix namespace for dbh 2015-12-21 11:10:24 -05:00
Isaac Connor
8682b1af28 rough in a Storage class for the perl side of things 2015-12-21 11:03:53 -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
arjunrc
27b1b37d5b added opt_use_api 2015-12-19 17:43:36 -05:00
Isaac Connor
fd773858a6 Merge branch 'better_zmvideo' into newpointone 
Conflicts:
	scripts/zmfilter.pl.in
 2015-12-18 14:17:45 -05:00
Isaac Connor
d035753971 Add the event class. 
Also, remove the unused Storage class
 2015-12-17 14:38:18 -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
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
Marco
62095b30d0 Added autostop to Down command 2015-12-16 16:58:20 +01:00
Isaac Connor
39e396eb6e Merge branch 'master' into multi-server 2015-12-09 10:36:51 -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
Robin Daermann
49a89b75a8 More verbose error reporting 2015-11-09 16:15:53 +01:00
dreaddy
3479af78bd Add more verbose help 2015-11-06 13:36:29 -05:00
Robin Daermann
a942b22541 Add camera control module for Vivotek ePTZ protocol 2015-11-04 17:12:07 +01:00
dreaddy
35617a6cf7 #1128 - Added option to enable send email by ssmtp mail. Option for custom ssmtp path. Conditional checks for new options in filter 2015-11-02 22:16:10 -05: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
b0b69c5176 parse ZM_SERVER_HOST into ZM_SERVER 2015-10-02 12:32:41 +00: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
Pliable Pixels
73fa051ef8 Google recaptcha 2015-08-29 13:29:52 -04:00
Isaac Connor
cf3f160783 add error handling on failure to open serial port 2015-07-15 16:02:02 -04:00
Isaac Connor
4630bad24b add http to control url if it isn't present 2015-07-15 15:59:21 -04:00
Pliable Pixels
f8cc27e224 Protocol for 8918W 2015-06-19 15:45:50 -04:00
Pliable Pixels
991291ce67 declared so perl does not complain of globals 2015-06-19 14:12:08 -04:00
Pliable Pixels
39ee845ff0 Updated 9831W foscam script 2015-06-19 12:58:40 -04:00
Andrew Bauer
d509861f9e Merge pull request #838 from ZoneMinder/zmaudit_update1 
Zmaudit update1: Make MIN_AGE Configurable
 2015-05-21 12:10:08 -05:00
Isaac Connor
950cd06535 Revert "Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting"" 
This reverts commit 9c73b7247c.
 2015-05-13 11:38:55 -04:00
Isaac Connor
9c73b7247c Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting" 
This reverts commit a5fed03524.
 2015-05-13 11:37:13 -04:00
Isaac Connor
a5fed03524 Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting 2015-05-13 11:33:22 -04:00
Isaac Connor
246fadb097 support the old use of just putting the password in the control field 2015-05-13 08:23:16 -04:00
Isaac Connor
e8114c90bb Fix printMsg. We don't use it as an object method. Update to parse a user:password out of ControlAddress which is what a lot of other scripts do. 2015-05-12 17:08:55 -04:00