mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-10 18:06:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,203 Commits 80 Branches 104 Tags
a933d4ae129b634ea3da170a9e857e5933223792
Commit Graph

1102 Commits

Author SHA1 Message Date
Adam Reiser
659b3f37f5 Stylistic fix 2015-12-29 21:08:24 -08:00
Adam Reiser
28bf4dfe7b Add option for strict host key checking 2015-12-29 16:34:11 -08:00
Isaac Connor
39bcb20dac Skip directories that have non-digits in them 2015-12-22 12:59:37 -05:00
Isaac Connor
1aa79c306b Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2015-12-22 09:47:45 -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
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
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
arjunrc
27b1b37d5b added opt_use_api 2015-12-19 17:43:36 -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
b32ef7751b implement the options to generate videos for events specified by a stored filter. Also implement ability to generate a concatenated video of all events specified by the filter. 2015-12-17 14:36:40 -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
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
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
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
dreaddy
92401193a7 Add missing semicolon 2015-11-06 11:19:12 -05:00
dreaddy
ced0240fc3 Use the ssmtp path set in options first. shell command if ssmtp path empty. display debug suggesting set ssmtp path in option. 2015-11-06 10:43:30 -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
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