Isaac Connor
2460bccdac
fix missing $
2016-06-06 10:18:21 -04:00
Isaac Connor
ef9c0ca33a
Debug the SQL on execute, not on parse
2016-06-03 11:15:40 -04:00
Isaac Connor
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
Isaac Connor
8a14d6f4d2
Don't not load the event if it was videod before
2016-05-30 14:57:46 -04:00
Isaac Connor
4469f909fa
Add support for DefaultVideo to video generation
2016-05-30 14:07:40 -04:00
Isaac Connor
07878e3e13
Put back the code that makes getDiskPercent look in the storagearea
2016-05-30 10:43:51 -04:00
Isaac Connor
886d88b184
Merge branch 'improve_filter' into storageareas
2016-05-30 09:30:18 -04:00
Isaac Connor
63ac75b440
use ::Database::dbh instead of 3013self{dbh}
2016-05-30 09:27:36 -04:00
Isaac Connor
2663781adc
put back missing my =__git_main[0];
2016-05-30 09:13:39 -04:00
Isaac Connor
7bc95561ad
fix
2016-05-29 11:37:32 -04:00
Isaac Connor
d52a6f9a95
Merge branch 'improve_filter' into storageareas
2016-05-27 09:57:05 -04:00
Isaac Connor
419e67caa1
Put back the code that populates ZM_SERVER_ID
2016-05-26 12:42:22 -04:00
Isaac Connor
05709f3084
Merge branch 'id_on_console' into storageareas
2016-05-26 11:17:41 -04:00
Isaac Connor
a0af99459a
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-05-25 10:12:22 -04:00
Isaac Connor
aedba1bc7f
whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one.
2016-05-24 16:49:04 -04:00
Isaac Connor
8fabeb78d3
Merge branch 'fix_zone_edit' into storageareas
2016-05-24 15:55:49 -04:00
josh4trunks
57a25373fa
Add logic to Config.pm
2016-05-22 08:53:30 -07:00
josh4trunks
a3fe6ea181
Apply changes to Logger.pm
2016-05-22 08:28:23 -07:00
josh4trunks
38e1cc909c
Reapply changes to Database.pm
2016-05-22 08:19:18 -07:00
Isaac Connor
1e52934dcf
Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem
2016-05-20 20:33:47 -04:00
Isaac Connor
bb5dbf3e4a
Need to import Config Data into Config
2016-05-20 09:29:40 -04:00
Isaac Connor
182fa9a5cd
revert the bulk of the merge_db_connects changes.
2016-05-20 08:53:53 -04:00
Andrew Bauer
46039a1887
Merge pull request #1472 from ZoneMinder/v4l1_compat
...
V4l1 compat
2016-05-16 13:02:27 -05:00
Isaac Connor
3780f8a2e6
move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module
2016-05-16 09:31:54 -04:00
Isaac Connor
e9d8b7925a
Merge branch 'db_reconnect' into storageareas
2016-05-10 11:13:09 -04:00
Isaac Connor
aaa4b3a824
check for db connection before assuming that dbh is valid
2016-05-10 11:11:45 -04:00
Isaac Connor
a5ba4759bf
fix new config entry
2016-05-10 10:54:40 -04:00
Isaac Connor
17f4f5789e
Merge branch 'master' into v4l1_compat
2016-05-10 10:10:48 -04:00
Isaac Connor
a012320a3e
Whitespace and code style changes. Change Event->getEventPath to Event->getPath to sync with PHP version
2016-05-10 09:06:49 -04:00
Isaac Connor
07e988266a
Merge branch 'merge_db_connects' into storageareas
2016-05-09 13:28:40 -04:00
Isaac Connor
9d9f2453c3
deprecate ConfigAdmin, merge it into Config.pm
2016-05-09 13:27:22 -04:00
Isaac Connor
cd8c9703c0
remove extra q
2016-05-09 12:48:56 -04:00
Isaac Connor
2fec880ff6
fix help/description mixup
2016-05-09 12:48:35 -04:00
Isaac Connor
5806eb0958
Merge branch 'v4l1_compat' into storageareas
2016-05-09 12:46:34 -04:00
Isaac Connor
08bf97fe85
Add a config entry for ZM_LD_PRELOAD
2016-05-09 12:44:41 -04:00
Isaac Connor
beebe74e7b
Merge branch 'merge_db_connects' into storageareas
2016-05-09 12:26:17 -04:00
Isaac Connor
b33e35bda7
move the require to the top
2016-05-09 12:14:59 -04:00
Isaac Connor
3522c5796b
add BEGIN Back to ZoneMinder.pm
2016-05-09 12:01:26 -04:00
Isaac Connor
e064af4214
Merge branch 'merge_db_connects' into storageareas
2016-05-07 09:35:14 -04:00
Isaac Connor
b444c8a6b4
Move the BEGIN from ZoneMinder to ZoneMinder/Base.
2016-05-07 09:34:45 -04:00
Isaac Connor
6e32b5d266
Use fully specified COnfig hash to simplify Symbol tables
2016-05-07 09:34:04 -04:00
Isaac Connor
1d63062188
Merge branch 'merge_db_connects' into storageareas
2016-05-07 09:30:18 -04:00
Isaac Connor
f55f979cc9
use fully specified Config to simplify symbol tables
2016-05-07 09:30:03 -04:00
Isaac Connor
18442be77f
Merge branch 'merge_db_connects' into storageareas
2016-05-03 14:09:18 -04:00
Isaac Connor
e3d581dcab
use single quotes instead of double quotes
2016-05-03 10:23:09 -04:00
Isaac Connor
24bf91707f
Database module should really use DBI
2016-05-03 10:22:38 -04:00
Isaac Connor
e80db4c433
Use zmDbConnect instead of duplicated db connect code
2016-05-03 10:22:16 -04:00
Isaac Connor
49e3d3be7a
Turn the config loading code from a BEGIN to a function that could be called repeatedly.
2016-05-03 10:21:50 -04:00
Isaac Connor
9406a2337f
Add a BEGIN section to load things in the correct order.
2016-05-03 10:21:01 -04:00
Isaac Connor
2ba18e14fc
Merge branch 'merge_db_connects' into storageareas
2016-05-03 09:05:36 -04:00
Isaac Connor
30f34a6f49
instead of code duplication for opening the db, use zmDbConnect everywhere
2016-05-03 08:59:40 -04:00
Isaac Connor
55d58a140e
instead of code duplication for opening the db, use zmDbConnect everywhere
2016-05-03 08:57:51 -04:00
Isaac Connor
408fba8d24
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-30 10:09:52 -04:00
Steve Gilvarry
6bf43631e2
Merge pull request #1428 from ZoneMinder/better_zmvideo
...
Better zmvideo
2016-04-28 22:00:52 +10:00
Isaac Connor
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04:00
Andrew Bauer
1072327dd1
remove extra quote
2016-04-21 08:01:13 -05:00
Andrew Bauer
3a9ab7f685
Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option
2016-04-21 07:27:19 -05:00
Isaac Connor
67f38d07df
Merge branch 'master' into better_zmvideo
2016-04-20 12:04:15 -04:00
Isaac Connor
a2d92300b3
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-11 21:51:41 -04:00
Isaac Connor
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
Andy Bauer
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
Isaac Connor
dd7f399959
Merge branch 'remove_local_zm_conf_override' into storageareas
2016-04-04 16:13:44 -04:00
Isaac Connor
a31660c1f6
Remove the code looks for zm.conf in the current dir.
2016-04-04 10:45:58 -04:00
Isaac Connor
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
Sándor Czettner
38e3c92546
Minor grammar fixes
2016-03-25 13:18:43 +00:00
Isaac Connor
3a8352eb6b
Merge branch 'master' into storageareas
2016-03-21 10:25:03 -04:00
Kyle Johnson
4e1af516d7
Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful.
2016-03-11 14:29:48 -07:00
Isaac Connor
0d8c63f578
Merge branch 'master' into storageareas
2016-03-02 09:11:55 -05:00
Kyle Johnson
bc89b95470
Merge pull request #1292 from ZoneMinder/telemetry
...
Telemetry Data
2016-03-01 07:17:16 -07:00
SteveGilvarry
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
SteveGilvarry
6b169af655
Remove eyezm configdata
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2016-02-26 22:35:24 +11:00
Isaac Connor
86c223668d
Merge branch 'master' into storageareas
2016-02-25 19:11:38 -05:00
Andy Bauer
7a42a8c3f9
add Netcat ONVIF compatible ptz control
2016-02-24 10:15:59 -06:00
Isaac Connor
66e76e4c2e
Merge branch 'zm_trigger_improvements' into storageareas
2016-02-19 11:09:41 -05:00
Isaac Connor
64c5b64068
Log error before croaking and include port# in the error message
2016-02-19 11:04:02 -05:00
Isaac Connor
327a01cb20
Log error before croaking and show path to file in the error message
2016-02-19 10:59:40 -05:00
Isaac Connor
3a512f87a5
Log the reason for croaking before croaking.
2016-02-19 10:57:52 -05:00
Andy Bauer
ee3f87a2ad
additional refinements to zmtelemetry
2016-02-13 14:53:22 -06:00
Isaac Connor
0ff0262c8b
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-12 19:12:12 -05:00
Andrew Bauer
18c493a180
Add getUUID subroutine, Add ZM_TELEMETRY_LAST_UPLOAD
2016-02-10 13:04:14 -06:00
Isaac Connor
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05:00
Andy Bauer
b718bd298f
Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ
2016-02-09 06:56:38 -06:00
Dmitry Smirnov
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
Andrew Bauer
8a537029ea
Initial commit to add zmtelemetry.pl
2016-02-06 14:08:28 -06:00
Isaac Connor
1837cc89ea
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
version
2016-02-04 12:24:07 -05:00
Isaac Connor
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
Isaac Connor
d65c9d797b
fix merge, update to 1.30.1
2016-02-04 12:13:48 -05:00
Isaac Connor
9ace6c518d
Merge pull request #1225 from Simpler1/profiles
...
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-02-04 11:55:48 -05:00
Isaac Connor
52e16dbdd0
Merge pull request #1249 from knnniggett/pelcop
...
Fix PelcoP checksum calculation
2016-02-04 11:52:51 -05:00
Andrew Bauer
748754a213
Merge pull request #1209 from adamreiser/StrictKeyChecking
...
Strict key checking
2016-02-04 10:07:19 -06:00
Isaac Connor
11b206e281
fix getPath -> Path
2016-02-01 12:52:14 -05:00
Isaac Connor
ff46344175
Use Storage Areas in geteventPath
2016-02-01 12:51:43 -05:00
Andy Bauer
fa168027b3
Fix PelcoP checksum calculation
2016-01-24 07:45:04 -06:00
Andrew Bauer
50b113cd02
Merge pull request #1189 from marcolino7/master
...
PTZ - Added autostop to Down command on FI8918W
2016-01-24 07:40:30 -06:00
Isaac Connor
7700623b16
Move SQL debug to Execute
2016-01-13 09:02:37 -05:00
Isaac Connor
270c737f40
Merge branch 'master' into storageareas
2016-01-05 09:36:36 -05:00
Isaac Connor
f0486e5b5e
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
2016-01-04 22:07:07 -05:00
Isaac Connor
a6c3d05071
Debug return events and the sql used
2016-01-04 16:01:07 -05:00
Isaac Connor
17adc2b4e5
Rough in a Monitor class
2016-01-04 15:27:42 -05:00
Simpler1
1432c6ae1f
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-01-04 12:30:46 -05:00
Isaac Connor
bf2195828f
Merge branch 'multi-server' into storageareas
...
Conflicts:
docs/installationguide/index.rst
2016-01-02 14:42:47 -05:00
Isaac Connor
54bff42fa0
Remove warnings when no server set
2016-01-01 21:27:30 -05:00
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
d943488475
add sub Storage
2015-12-24 15:32:30 -05:00
Isaac Connor
177ed076a7
Make zmaudit only look at storage areas that are local
2015-12-24 15:25:56 -05:00
Isaac Connor
dfa9a5a390
Add AUTOLOAD
2015-12-23 14:31:56 -05:00
Isaac Connor
1328492c64
fixes
2015-12-23 14:16:09 -05:00
Isaac Connor
33a3661958
cleanup, revent to openprint style objects
2015-12-23 14:03:40 -05:00
Isaac Connor
9c6041d55b
require Object
2015-12-22 13:13:45 -05:00
Isaac Connor
3932ce692c
remove Exporter stuff
2015-12-22 12:55:36 -05:00
Isaac Connor
171fcf0dca
Use Object
2015-12-22 12:40:15 -05:00
Isaac Connor
26a92e5fed
require Object
2015-12-22 12:23:24 -05:00
Isaac Connor
7663955dc8
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-22 12:14:29 -05:00
Isaac Connor
e2f8b1adc3
rough in generic object, using some similar syntax to dbix
2015-12-22 12:13:57 -05:00
Isaac Connor
c9dc53b237
add in find and find_one
2015-12-22 11:50:08 -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
12d87c252f
Don't do Videod = 0, since zmvideo might need them to concatting and they won't regenerated if they exist anyways. Or maybe we want to encode them at a higher framerate or something
2015-12-21 16:04:31 -05:00
Isaac Connor
239b494db8
Add M.Id as MonitorID
2015-12-21 15:31:33 -05:00
Isaac Connor
07260adb2a
append ZoneMinder::General to executeShellCommand
2015-12-21 15:30:05 -05:00
Isaac Connor
a4024ffebc
Must do E.*, not *
2015-12-21 15:29:27 -05:00
Isaac Connor
9d454bdc41
Add test for empty storage path
2015-12-21 15:29:18 -05:00
Isaac Connor
3e29aa56a3
Return default event path when no Id in Storage
2015-12-21 15:27:53 -05:00
Isaac Connor
16a1768511
fixes
2015-12-21 15:19:57 -05:00
Isaac Connor
ad038edab4
chdir
2015-12-21 14:49:00 -05:00
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
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
Andrew Bauer
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -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
Andrew Bauer
a00f719f12
Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes
...
351-Rebase Attempt for ffmpeg stability fixes
2014-11-13 15:18:13 -06:00
jmcastro2014
5fe0b84b3c
Create 3S.pm
...
3S API Control Protocol Module
2014-11-12 08:40:35 -03:00
Isaac Connor
17e38560d6
just update the perldoc parts
2014-11-06 10:02:34 -05:00
Isaac Connor
4863ce96a3
remove annoying warning.
2014-10-31 14:12:36 -04:00