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

17642 Commits

Author SHA1 Message Date
Isaac Connor 23305be8bf break lone lines. Move sendTextFrame to public so that we can use it to send error message in image form. 2021-01-15 14:43:07 -05:00
Isaac Connor 3d234427e0 initialize packetqueue, analysis_it, storage and videostore in Monitor constructor initializer. Only delete packetqeuue if it has been created. 2021-01-15 14:42:30 -05:00
Isaac Connor 68b0f7e1b5 initialize packetqueue, analysis_it, storage and videostore in Monitor constructor initializer. Only delete packetqeuue if it has been created. 2021-01-15 14:42:26 -05:00
Isaac Connor 27e10c2ed9 cleanup encoding code. Update logging 2021-01-15 11:55:46 -05:00
Isaac Connor 10e56df53c analysis_limit > cpature fps: only log a warning if we have actually been capturing for a while. If doing passthrough, need to start continuous event from last keyframe 2021-01-15 11:54:36 -05:00
Isaac Connor 83c60b7317 Make the error message clearer by actually printing the time. 2021-01-15 11:53:25 -05:00
Isaac Connor 254077b79d
Merge pull request #3108 from hax0kartik/Add-padding 
Fix padding issue in timestamp code
 2021-01-15 11:52:40 -05:00
hax0kartik 6845c2cab4 Fix padding issue in timestamp code 2021-01-15 11:46:30 +05:30
Isaac Connor f2fea95f4b Merge branch 'master' into zma_to_thread 2021-01-14 13:02:52 -05:00
Isaac Connor 02386f0c64 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED for zmfilter. 2021-01-14 12:56:54 -05:00
Isaac Connor ad330cb949 Make images in modals max-width: 100% so they fit within the modal. 2021-01-14 12:56:54 -05:00
Isaac Connor 7d08f24895 use pageX and pageY instead of page.x and page.y 2021-01-14 12:56:54 -05:00
Isaac Connor 16db59ecb1 use pageX and pageY instead of page.x and page.y 2021-01-14 10:33:03 -05:00
Isaac Connor e530a51af7 WHen ret=0 is not failure, not success. Don't log error. Return the return code instead of -1 2021-01-14 10:31:55 -05:00
Isaac Connor f44f920bf2 spacing 2021-01-14 10:31:29 -05:00
Isaac Connor 9a824716b5 Fix clicking on pills committing the form. Remove hidden inputs and use pills to toggle visibility of divs instead. rename newControl to Control. Use button as the action input 2021-01-12 18:41:24 -05:00
Isaac Connor ef2f126eaa Merge branch 'master' into zma_to_thread 2021-01-12 14:37:25 -05:00
Isaac Connor 81acf4bf69 Fix ul nesting. Add navbar-nav to collapsed nav elements to fix spacing. 2021-01-12 14:29:53 -05:00
Isaac Connor 0a9681636f rename getAcct to getAccount 2021-01-12 14:20:05 -05:00
Isaac Connor e496679efd Set transaction isolation level to READ COMMITTED so that concurrent event inserts don't deadlock 2021-01-12 14:19:04 -05:00
Isaac Connor 8de122ef26 remove await that we can't use 2021-01-12 14:13:42 -05:00
Isaac Connor 3423d8ed05 Only delete packets up to the next video keyframe. Don't be too aggressive 2021-01-12 14:13:12 -05:00
Isaac Connor 5b7fc210fe Only use direct to rgb0 when image colours are 4 2021-01-12 14:12:09 -05:00
Isaac Connor 164a0f5a44 Need to use get_packet so that packets getting written to event are locked. Because queuePacket might delete them. 2021-01-12 14:11:47 -05:00
Isaac Connor 04c02dd1ef Spacing 2021-01-12 14:11:06 -05:00
Isaac Connor e706b4ba33 Hitting beginning of queue can happen on stream startup. So in that case make it a debug. Once the stream has been going for a while there should always be enough packets in the queue so make it a warning 2021-01-11 17:18:14 -05:00
Isaac Connor c6cf1da47d Merge branch 'master' into zma_to_thread 2021-01-11 17:08:44 -05:00
Isaac Connor a51dfe552b Remove auth_hash var that overlaps global auth_hash var. Use attr('src') instead of src 2021-01-11 16:41:43 -05:00
Isaac Connor 3639593ae5 use js.post instead of getJSON. 2021-01-11 15:22:15 -05:00
Isaac Connor bb50de268b Fix setting img.src to new url. Won't have any effect here as we are reloading the whole page. 2021-01-11 15:21:39 -05:00
Isaac Connor 8204d2d7eb Introduce sleep() function. Use it on ajax error to wait 1 second before reloading page 2021-01-11 13:57:39 -05:00
Andrew Bauer 1f2c10dcc0 replace mootools getelement and addevent 2021-01-11 13:47:36 -05:00
Andrew Bauer 2f8f0a0b4a use plain js to get the livestream rather than mootools 2021-01-11 13:47:36 -05:00
Andrew Bauer ac5c821bbd use plain js for mouseover thumb animation 2021-01-11 13:47:36 -05:00
Andrew Bauer 11bc2d7682 bind this to streamCmdQuery 2021-01-11 13:47:36 -05:00
Andrew Bauer 4dea379673 increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback 2021-01-11 13:47:36 -05:00
Andrew Bauer a761b9c0ff deprecate legacy "stills" option from event view 2021-01-11 13:47:34 -05:00
Andrew Bauer 5b40589d61 add a button to go to the stats view 2021-01-11 13:46:51 -05:00
Andrew Bauer 6796126ae2 autohide frame stats when out of pixels 2021-01-11 13:46:51 -05:00
Andrew Bauer 61dc0adb60 remove extra uneeded on change event handler 2021-01-11 13:46:51 -05:00
Andrew Bauer bbf233b332 fix frame view scale control 2021-01-11 13:46:51 -05:00
Andrew Bauer 64f755be4a clean up postlogin js 2021-01-11 13:46:51 -05:00
Andrew Bauer 751102fa6d eslint 2021-01-11 13:46:51 -05:00
Andrew Bauer 8d75f30d22 remove unneeded comment 2021-01-11 13:46:51 -05:00
Andrew Bauer 2e932571f3 autohide the event stats when out of pixels 2021-01-11 13:46:51 -05:00
Andrew Bauer beb74cb54a replace mootools Request.JSON 2021-01-11 13:46:51 -05:00
Andrew Bauer 381bf0c219 fix cyclePrev with only 1 monitor 2021-01-11 13:46:51 -05:00
Andrew Bauer 3f73c3bc9d replace Mootool delay with setTimeout 2021-01-11 13:46:50 -05:00
Andrew Bauer 57da991e7a go back rather than close window 2021-01-11 13:46:50 -05:00
Andrew Bauer 638e801c07 replace mootools .delay method 2021-01-11 13:46:50 -05:00