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

12256 Commits

Author SHA1 Message Date
Isaac Connor c017219a1e use do instead of many lines of dbi. Cleanup logic around command detection 2018-12-27 12:22:06 -05:00
Isaac Connor 55639a5c45 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-27 11:53:31 -05:00
Isaac Connor db6d943854 If failure in connect, close the fd before returning 2018-12-27 11:53:21 -05:00
Isaac Connor b87ae53a83 merge debug lines and correct spacing 2018-12-27 11:50:43 -05:00
Andrew Bauer 5f9a113da1
redirect to montage rather than montagereview 2018-12-26 10:34:01 -06:00
techrockedge 731453a7cd Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 
continued work
 2018-12-26 10:55:20 -05:00
Andrew Bauer 27dd8166ea
Merge pull request #2362 from connortechnology/small_groups_fixes 
Small groups fixes
 2018-12-24 11:30:57 -06:00
Isaac Connor 55e0d82f20 spacing 2018-12-24 11:30:22 -05:00
Isaac Connor e0a9c4a21e fix event popup detection 2018-12-24 11:23:58 -05:00
Isaac Connor 68adc289fe Fix colspan count now that depth is zero-based 2018-12-24 09:40:23 -05:00
Isaac Connor e0cae5709f Group::find is now more powerful so we can just use it to return all Groups to be deleted 2018-12-24 09:39:40 -05:00
Isaac Connor 63199289ad Change depth function to be 0-based. 2018-12-24 09:38:55 -05:00
Isaac Connor 0cce0a642b Update chosen library to 1.8.7 2018-12-24 09:37:49 -05:00
techrockedge f815aaa5f5 Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 2018-12-21 19:46:45 -05:00
Andrew Bauer 153877b9c0
Merge pull request #2359 from connortechnology/fix_2353 
Update permissions checking for Groups to not use session. Fixes #2353
 2018-12-21 15:16:49 -06:00
Isaac Connor e5a073c8df Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-21 10:50:30 -05:00
Isaac Connor 1130d6650a Fix spacing and pass popup to previous/next event so that popups stay as popups 2018-12-21 10:50:19 -05:00
Isaac Connor 47465260d1 Update permissions checking for Groups to not use session. Fixes #2353 2018-12-21 10:01:48 -05:00
Andrew Bauer 6eb7892fc7
Merge pull request #2357 from connortechnology/libswresample 
Implement libswresample support as an alternative to libavresample, w…
 2018-12-20 16:44:06 -06:00
Isaac Connor 48865f124b cap AAC bitrate at 96000 to prevent the aac encoder from complaining 2018-12-20 15:10:04 -05:00
Isaac Connor a277f697e9 whitespace 2018-12-20 14:58:38 -05:00
Isaac Connor 6ee72aa2d9 Implement libswresample support as an alternative to libavresample, which is deprecated 2018-12-20 14:06:56 -05:00
Isaac Connor 88e148068e Logging and whitespace 2018-12-20 13:56:57 -05:00
Isaac Connor 6af8f0d419 Logging and whitespace 2018-12-20 13:55:18 -05:00
Isaac Connor 64bdf40e86 Logging and whitespace changes. No logical changes 2018-12-20 13:50:55 -05:00
Isaac Connor eccfdb8a6a Logging and whitespace changes. No logical changes 2018-12-20 13:50:07 -05:00
Isaac Connor 1d371b7a17 Fix small memleak of linked_monitors not getting freed on Monitor destruction. Fix unlocking db mutex before logging 2018-12-20 13:41:57 -05:00
techrockedge eb83f2c759 Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 
r2c ptz
 2018-12-18 16:49:18 -05:00
Pliable Pixels 622c17f628 make sure auth is regenerated each time we call this API (#2347) 2018-12-16 11:02:07 -05:00
Andrew Bauer c1f46a9cb0
Update README.httpd 2018-12-15 16:29:44 -06:00
Andrew Bauer 5a6e700c45
rpm packaging - update fcgiwrap socket location 
I pushed a new fgciwrap package to Fedora and the socket file in the package is in a different location. See: https://bugzilla.redhat.com/show_bug.cgi?id=1655281
 2018-12-14 20:27:12 -06:00
techrockedge 180a4b07b1 foscam r2c ptz 2018-12-14 19:13:41 -05:00
techrockedge 51b4c27b27 foscam r2c ptz 2018-12-14 17:30:45 -05:00
techrockedge 54bf1982ca add auto preset delete 2018-12-14 15:41:04 -05:00
Isaac Connor ad4f131284 Must unlock before logging 2018-12-14 12:22:10 -05:00
Isaac Connor 1a05e777c0 fix path not being constructed properly for shallow event storage 2018-12-14 08:54:29 -05:00
Isaac Connor 83e74aec55 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-14 08:40:45 -05:00
Isaac Connor 70388753ea COmment out logging in signal handlers. Logging is too complex. 2018-12-14 08:40:32 -05:00
Pliable Pixels ebaafef607 Ffmpeg logs optional (#2345) 
* make ffmpeg logs configurable via web

* fix Info
 2018-12-14 08:01:23 -05:00
Andrew Bauer 3a08178500
Create support.yml 2018-12-13 19:00:46 -06:00
techrockedge e5e8559850 Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 
delete button
 2018-12-13 17:11:57 -05:00
Isaac Connor dd033cb069 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-13 16:20:20 -05:00
Isaac Connor a1e9058729 adjust ffmpeg logging levels 2018-12-13 16:19:55 -05:00
techrockedge 879fab24af Merge branch 'master' of git://github.com/ZoneMinder/zoneminder 
add preset delete option in the PTZ controls
 2018-12-13 14:49:41 -05:00
Isaac Connor b61eb7d4fc Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-13 10:53:56 -05:00
Isaac Connor 0c5eead929 Merge branch 'master' into fix_startup_db_connection 2018-12-13 10:53:34 -05:00
Isaac Connor 0784a8a5a1 reduce ffmpeg log levels from error to warning and warning to info. Ffmpeg outputs a lot of errors that don't significantly affect video recording. 2018-12-13 10:27:44 -05:00
Isaac Connor 50b67fe6bf Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-12-13 10:25:52 -05:00
Mike Rosack 567b60ffa7 support for forwarded proto/port in Server.php (#2343) 2018-12-13 10:24:32 -05:00
Andrew Bauer 882c4e2ea6
Update zm_update-1.33.0.sql 
fixes #2342
 2018-12-12 20:55:50 -06:00