ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,290 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1060 Commits

Author SHA1 Message Date
Isaac Connor 2a1ec2beb1 Merge pull request #1719 from knnniggett/hikvisionptz 
Add HikVision ptz control sciprt
 2017-01-03 08:59:56 -05:00
Isaac Connor ac88490338 When use warnings is on and there is a null value in the monitor data it causes warnings. So add skip if __git_main is not defined. 2017-01-02 12:49:37 -05:00
Andy Bauer 25ab1bee18 more fixed to gpl license text 2016-12-26 10:40:09 -06:00
Andy Bauer 0f15b3ae62 update gpl 2 mailing address 2016-12-26 10:33:03 -06:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Andrew Bauer 02e534dcff Merge pull request #1694 from connortechnology/disk_space_in_events 
Disk space in events
 2016-12-20 09:19:21 -06:00
Isaac Connor a9548d3f6b Add a config entry to turn event disk space on/off 2016-12-13 13:34:56 -05:00
Isaac Connor 8009bce3d9 quote the link name so that spaces don't break it 2016-12-13 13:23:20 -05:00
Isaac Connor 2c0a868eea fix typo 2016-12-08 11:02:59 -05:00
Andrew Bauer ecbaaef59a Merge pull request #1670 from connortechnology/fix_braces 
Fix braces
 2016-12-06 08:39:43 -06:00
Kyle Johnson 49620d51b9 Merge pull request #1692 from ZoneMinder/small_fixes 
Small fixes
 2016-11-24 20:42:45 -07:00
Isaac Connor 9e8404516b add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files 2016-11-22 11:02:38 -05:00
Isaac Connor 02cd3e8cba Merge branch 'master' into small_fixes 2016-11-22 10:52:07 -05:00
Isaac Connor 27b5b60eae Merge branch 'master' into fix_braces 2016-11-14 21:46:25 -05:00
Isaac Connor 1be6c57aee fix extra semi colon 2016-11-08 13:11:10 -05:00
Isaac Connor 5f0c1c0e26 fix layout in a complex map 2016-11-08 12:55:07 -05:00
Andrew Bauer 29e48da3b9 fix sftp xfers in zmfilter (#1677) 2016-11-07 16:08:43 -05:00
Andy Bauer 4be668f838 Add HikVision ptz control sciprt 2016-11-06 08:03:43 -06:00
Isaac Connor 0dbde8e290 correct a lot of braces 2016-11-04 15:53:14 -04:00
Isaac Connor 93725b3f4b fixup spacing in ConfigData 2016-11-04 14:05:51 -04:00
Isaac Connor 3d17067276 change tabs to spaces 2016-11-03 14:30:23 -04:00
Isaac Connor 68c8178648 remove some extra spaces 2016-11-03 14:21:07 -04:00
Isaac Connor bb371612c3 tabs to spaces 2016-11-03 14:18:03 -04:00
Andrew Bauer 191efed8e3 change fast_delete to off - fixes #1597 2016-10-19 14:10:28 -05:00
Isaac Connor a77de33997 add a test for lib existence 2016-09-27 12:51:04 -04:00
mdrush 69a71b1a37 cleaned up logic 2016-08-27 16:16:01 -07:00
mdrush 16a9de3b1b added missing brackets 2016-08-27 15:39:04 -07:00
mdrush 2d161924c0 changed error message to debug message 2016-08-27 15:34:10 -07:00
mdrush 52255e594e improved style, added fallback when ssmtp can't be found 2016-08-27 15:18:00 -07:00
mdrush 574390730a added missing ssmtp support in sendMessage 2016-08-27 13:10:39 -07:00
Isaac Connor 69461a7c1b Merge pull request #1579 from peruchi/master 
Update file sock for multiserver
 2016-08-17 10:23:01 -04:00
peruchi 50f55af68f Update zmdc.pl.in 2016-08-17 10:36:00 -03:00
peruchi 7b389a79a6 Update zmdc.pl.in 2016-08-17 09:45:30 -03:00
Isaac Connor fbc0086fcc get the other dbPass use and quote it. Slight visual code style cleanup. 2016-08-08 16:52:09 -04:00
Andrew Bauer 24d471f452 Merge pull request #1503 from ZoneMinder/id_on_console 
add option to show monitor ID on console
 2016-08-06 10:59:03 -05:00
Isaac Connor 9d65ef3bb2 Merge pull request #1556 from knnniggett/banner 
custom banner text on web console
 2016-08-06 10:59:53 -04:00
Andrew Bauer 528230c92d Merge pull request #1581 from ZoneMinder/fix_1571 
quote the password
 2016-08-06 09:37:11 -05:00
Andrew Bauer 382896dc0d Merge pull request #1498 from josh4trunks/mysql_port_socket 
Add support for MySQL Port / Unix Socket
 2016-08-06 09:32:32 -05:00
Andrew Bauer e6b1cf90df Merge pull request #1566 from gerdesj/Keekoon 
Control script for Keekoon cameras.
 2016-08-06 09:09:40 -05:00
peruchi 0d85d3e60d Update zmdc.pl.in 2016-08-02 16:26:27 -03:00
peruchi 0238656542 Update file sock for multiserver 
Added the ZM_SERVER_ID in the creation the sock for not to give conflict in mode multi server.
 2016-08-02 15:36:40 -03:00
Isaac Connor 25d58f5192 quote the password 2016-08-02 13:22:44 -04:00
Jon Gerdes ee720c4561 Control script for Keekoon cameras. Tested with KK002. 2016-07-25 11:20:49 +01:00
Dmitry Smirnov aed3c3d29a reduce noise on "zmupdate.pl" invocation 2016-07-14 00:43:32 +10:00
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
Andy Bauer 19265b631a custom banner text on web console 2016-07-09 13:11:30 -05: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