Commit Graph

11688 Commits

Author SHA1 Message Date
Andrew Bauer 4b2d4d3871 fix rpm specfile changelog 2018-09-12 12:44:36 -05:00
Andrew Bauer 2f7c9a406a bump sql to 1.32.0 2018-09-12 07:27:45 -05:00
Andrew Bauer 002bb67ccc bump version to 1.32.0 release 2018-09-12 07:09:25 -05:00
Andrew Bauer 014202c41e bump rpm specfile to 1.32.0 2018-09-12 07:08:58 -05:00
Andrew Bauer b3565fb983 remove file that should not be there 2018-09-12 07:02:57 -05:00
Andrew Bauer c66dd25ebb implement collapsible headers (#2203) 2018-09-11 17:39:40 -04:00
Isaac Connor eef928a742 fix find_all => find 2018-09-11 14:31:03 -04:00
Isaac Connor 684f48979a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-11 14:30:19 -04:00
Isaac Connor b545528bb0 If DefaultVideo is set, use the passthrough mp4 instead of generating and mp4 from jpegs 2018-09-11 08:49:42 -04:00
Isaac Connor c70fb2f195 When signal loss occurs, trigger an event close so that the event stops because we are no longer writing to the mp4 2018-09-10 17:11:16 -04:00
Isaac Connor bf1fbd169c return uninformative debug statement 2018-09-10 15:12:19 -04:00
Isaac Connor 8608fc97be fix trms=>terms 2018-09-10 15:11:57 -04:00
Isaac Connor 0ee261fae3 get rid of code that hid the close/back button on events if there was no history. 2018-09-10 15:11:41 -04:00
Isaac Connor 042d4c3099 Default to auditing all Storage Areas. Add a Server flag to audit only areas on a specific server. 2018-09-09 18:32:00 -04:00
Isaac Connor 534aebb21f When loading previous and subsequent log lines, merge the fields in the filters instead of replacing 2018-09-09 16:36:09 -04:00
Isaac Connor a296b2b777 fix crash when savind audio on ffmpeg 2.8 2018-09-09 14:01:03 -04:00
Isaac Connor 55dcb161ae find should always return an array 2018-09-09 13:59:10 -04:00
Isaac Connor b4f80fbe11 Always return an array from find 2018-09-09 13:56:29 -04:00
Isaac Connor 882e47c9ab Fix deleting empty directories 2018-09-09 13:28:24 -04:00
Isaac Connor 9e8a876101 Fix finding Storage by ServerId 2018-09-09 13:28:11 -04:00
Isaac Connor b8f6617db3 fix another instance of find_all 2018-09-09 12:15:06 -04:00
Isaac Connor 1a2232734c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-09 11:35:12 -04:00
Isaac Connor d945e2ba54 Fix context allocation on ffmpeg 2.8. Fixes #41 on connorTechnology fork. 2018-09-09 11:34:12 -04:00
Vitaly Saversky b778fd782c Misspelling - non-recordable (#2200) 2018-09-09 09:39:30 -04:00
Isaac Connor dfdac2ed70 make find and find_one functions consistent across Objects 2018-09-07 16:31:11 -04:00
Isaac Connor fa690826a3 clean up zmstats, add db reconnect 2018-09-07 16:30:47 -04:00
Isaac Connor b7aa11f109 Fix infinite loop reconnecting to db in Logging 2018-09-07 16:30:24 -04:00
Isaac Connor def72b8e66 tidy up license 2018-09-07 16:29:59 -04:00
Isaac Connor 426aeea95b add db reconnects to zmwatch. 2018-09-07 16:29:23 -04:00
Isaac Connor af32d59aa1 add libhuman-bytes-perl and libfile-slurp-file 2018-09-05 10:18:09 -04:00
Isaac Connor 730e1fda37 We only use File::Slurp when moving files to s3fs so only require it if doing that 2018-09-05 10:14:45 -04:00
Isaac Connor c34f899d31 eliminate warning when no Storage area is set. 2018-09-04 13:57:35 -04:00
Andrew Bauer 13558b2c12
convert existing http urls in help text to markdown 2018-09-04 07:39:46 -05:00
Andy Bauer ce48343d1a embed link to privacy statment in telemetry help text 2018-09-03 13:55:11 -05:00
Isaac Connor f4c2d8adea Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-03 12:29:09 -04:00
Andrew Bauer e5a2581dcc optionhelp - support links markdown style (#2198) 2018-09-03 09:56:52 -04:00
Andrew Bauer 36322f9129 rpm - use _pkgdocdir instead of _docdir 2018-09-01 12:15:08 -05:00
Andrew Bauer 86f043633a typo 2018-09-01 12:04:48 -05:00
Andrew Bauer 563e673bee rpm - rename README.xxx to README for all builds 2018-09-01 11:53:56 -05:00
Isaac Connor 9ec415b30a Just reload the event view instead of dynamically updating the stream. Fixes #2196 2018-08-31 15:56:21 -04:00
Isaac Connor 798aab84f3 whitespace changes 2018-08-31 11:58:33 -04:00
Isaac Connor 623d31edae Don't do csrf for view=image 2018-08-31 11:58:17 -04:00
Isaac Connor 7ee80e7cca Debug lines should be debug, not warning 2018-08-31 11:58:03 -04:00
Isaac Connor 57d5e28870 clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output 2018-08-31 11:57:47 -04:00
Isaac Connor f3a7a61849 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-31 10:53:26 -04:00
Isaac Connor 0823b28712 whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in 2018-08-31 10:37:11 -04:00
Isaac Connor 4b30ea7877 cleanup, whitespace 2018-08-31 10:35:23 -04:00
Andrew Bauer 029c6401af add libjson-maybexs-perl as a debian package dependency 2018-08-31 09:34:54 -05:00
Isaac Connor 799b34eee8 handle xhr errors like when auth is no longer valid. Do a page refresh when this happens 2018-08-31 10:34:54 -04:00
Andrew Bauer 18c88be550
bump rpm specfile to 1.31.47 2018-08-31 07:59:51 -05:00