mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-06 15:07:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,962 Commits 76 Branches 104 Tags
45a62dc8d89933c856f16a76ea8496eabd40b7bf
Commit Graph

1010 Commits

Author SHA1 Message Date
Isaac Connor
85c0377280 When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it 2016-07-12 14:21:54 -04:00
Isaac Connor
6129732e61 restore the behaviour where the generated file names are printed to stdout. 2016-07-11 08:01:43 -04:00
Isaac Connor
1069b301a0 functions have been moved from ConfigAdmin to Config 2016-06-12 15:38:59 -04:00
Isaac Connor
1983f106f4 Add a missing sth->finish 2016-05-27 09:01:01 -04:00
Isaac Connor
b0116f25e9 put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo 2016-05-27 08:59:46 -04:00
Isaac Connor
3f880fad3a Merge pull request #1500 from knnniggett/zmdc_unlink 
remove one unlink, add better error reporting to the rest
 2016-05-24 14:35:39 -04:00
Andrew Bauer
0052bb080c unlink only if file exists 2016-05-24 12:13:17 -05:00
Andrew Bauer
11701357aa remove one unlink, add better error reporting to the rest 2016-05-24 09:01:32 -05:00
Andrew Bauer
bc163b33fc move multiserver message to once during startup only 2016-05-23 20:06:29 -05:00
Andrew Bauer
8bbb443c67 fix invalid key name in config hash 2016-05-20 10:35:03 -05: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
Isaac Connor
924acf4284 fix zmdc.pl hang due to needing to connect to db after fork 2016-05-19 15:01:31 -04:00
Isaac Connor
8e06c0ec63 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-19 12:08:56 -04:00
Isaac Connor
183f9c70a4 Must use ZoneMinder instead of ZoneMinder::Logger 2016-05-19 12:08:45 -04:00
Andrew Bauer
8bac5fbdfb typo - remove extra comma 2016-05-18 16:58:04 -05:00
Andrew Bauer
46039a1887 Merge pull request #1472 from ZoneMinder/v4l1_compat 
V4l1 compat
 2016-05-16 13:02:27 -05:00
Isaac Connor
b53a0a564d Don't need the extra use ZoneMinder::Config 2016-05-16 10:07:24 -04:00
Isaac Connor
dd24c35afa revert bogus optimisation 2016-05-16 10:05:12 -04: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
5df85770cd zmupdate.pl.in 2016-05-13 13:52:34 -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
605edfd6d0 add ENV{LD_PRELOAD} setting 2016-05-09 12:46:26 -04:00
Isaac Connor
08bf97fe85 Add a config entry for ZM_LD_PRELOAD 2016-05-09 12:44:41 -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
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
f55f979cc9 use fully specified Config to simplify symbol tables 2016-05-07 09:30:03 -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
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
Steve Gilvarry
6bf43631e2 Merge pull request #1428 from ZoneMinder/better_zmvideo 
Better zmvideo
 2016-04-28 22:00:52 +10: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
abi
7058b0862a suppressed warnings of killall for FreeBSD 2016-04-16 16:39:58 +03:00
Andy Bauer
4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05: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
a31660c1f6 Remove the code looks for zm.conf in the current dir. 2016-04-04 10:45:58 -04:00
Sándor Czettner
38e3c92546 Minor grammar fixes 2016-03-25 13:18:43 +00:00
Isaac Connor
6d4d05184c fix typo 2016-03-23 09:49:38 -04:00
Isaac Connor
d3558c5688 Merge pull request #1323 from knnniggett/zmfilter 
fix missing Net::SFTP::Foreign::debug warning
 2016-03-21 10:47:50 -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
Kyle Johnson
b9085cea64 Fix issue where programs are installed in unexpected paths. 
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
 2016-03-11 14:28:16 -07:00
Andrew Bauer
facae6cb0d use make "-f" parameter instead of "--makefile" 2016-03-10 13:58:41 -06:00