mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-24 14:08:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,341 Commits 66 Branches 101 Tags
cf7e1688722c49ae11a50c1d2181124b8e7a94de
Commit Graph

278 Commits

Author SHA1 Message Date
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
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
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
Andrew Bauer
c7a50a7cbc Replace newlines with a space 2015-05-09 12:13:38 -05:00
Andrew Bauer
c7c0622673 rpmbuild incorrectly interprets the text "use standard" as a Perl module dependency. 2015-05-09 12:10:12 -05:00
Dmitry Smirnov
eddada011c spelling corrections (thanks, /usr/bin/codespell) 2015-04-19 20:38:23 +10:00
Dmitry Smirnov
abc8d3fdd1 ConfigData.pm: wrap extraordinary long lines using new "qqq()" function. 2015-04-19 18:15:51 +10:00
Dmitry Smirnov
458ed9ede9 ZoneMinder.pm: minor re-wrapping 2015-04-19 18:15:23 +10:00
Dmitry Smirnov
62c1429039 wrap long lines 2015-04-19 16:31:53 +10:00
Dmitry Smirnov
6a150d2607 tabs-to-spaces 2015-04-19 15:17:10 +10:00
Dmitry Smirnov
85d75b0b27 Logger.pm: define '$LOGFILE' 
non-bareword LOGFILE should be defined.
 2015-04-17 11:15:49 +10:00
Dmitry Smirnov
59b63188cb eliminating {Two-argument "open"}/{Bareword file handle}. See pages 202,204 of PBP. (Severity: 5) 2015-04-17 09:33:06 +10:00
Dmitry Smirnov
3d512dbada eliminate Subroutine prototypes 2015-04-17 09:22:47 +10:00
Dmitry Smirnov
f02b9c94ec PelcoP.pm: correct package declaration (thanks, perlcritic) 
Package declaration must match filename at line 25, column 1.  Correct the filename or package statement.  (Severity: 5)
 2015-04-17 08:24:01 +10:00
Isaac Connor
1668949f18 Merge pull request #792 from knnniggett/perl 
cmake - use perl INSTALLDIRS
 2015-04-15 11:07:14 -04:00
Andrew Bauer
30765fdedf hide USE_DEEP_STORAGE 2015-04-12 12:20:20 -05:00
Andrew Bauer
0cf82a0b71 Allow user to override perl installation. Replace old perl cmake vars with new. 2015-04-10 12:09:01 -05:00
Andrew Bauer
e6631ebaf1 Propagate new perl changes to the ONVIF perl modules 2015-04-09 20:11:32 -05:00
abauer
a2d9c0c042 Don't copy .in files into staging 2015-04-08 12:22:46 -05:00
Andrew Bauer
e895fd26f7 cmake - use perl INSTALLDIRS 2015-04-07 08:19:21 -05:00
Dmitry Smirnov
904f2989ed Improving ZM_USE_DEEP_STORAGE description (#783): 
Removed "If you are upgrading from a previous version of ZoneMinder" from
 description. From data loss prospective it is irrelevant whether database
 is upgraded or not as fresh install is just as vulnerable.
 Changed "enable" to "change" to emphasize the above.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-04-06 18:39:13 +10:00
Andrew Bauer
3e8c894a3e Update ConfigData.pm.in 2015-04-04 09:20:21 -05:00
Dmitry Smirnov
b0faa138bd POD: added missing NAME sections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-03-30 15:07:03 +11:00
Dmitry Smirnov
11f7af3b03 fixing POD errors 
manpage-has-errors-from-pod2man (forgotten '=back' before '=head2')

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-03-30 14:41:01 +11:00
Andrew Bauer
7ef503ff59 User configurable arp tool 2015-02-21 13:08:04 -06: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
Isaac Connor
50e6784779 this adds two config options to System tab to set the default skin and css 2014-12-17 16:45:41 -05:00
Isaac Connor
a52f07fa8e Some cleanups, remove code that does nothing. 
Instead of using ControlDevice to store the password, parse the ControlAddress to get username, password
enforce a port, which fixes the Digest Auth.
 2014-12-08 15:54:27 -05:00
Isaac Connor
f8dd2c6eaf Merge branch 'master' into controlversionfixes 2014-11-19 12:53:28 -05:00