Commit Graph

4323 Commits

Author SHA1 Message Date
Isaac Connor 858ae8b11f fix alignment and min width of datetime column in logs view 2021-03-21 18:17:13 -04:00
Peter Keresztes Schmidt 7f9c9c6624 web: make eslint happy 2021-03-21 21:40:41 +01:00
Isaac Connor 8a1284e2fa Can't use a decimal step. Has to be any because browsers suck. 2021-03-21 12:30:56 -04:00
Isaac Connor a57473a146 remove debug 2021-03-21 09:19:31 -04:00
Isaac Connor cc455e5d74 fix require=>require_once for User.php. Use getBodyTopHTML so that we get the error reporting 2021-03-21 09:18:47 -04:00
Isaac Connor 70e61740d3 Fix eslint 2021-03-18 16:48:26 -04:00
Isaac Connor e39c293a77 fix eslint 2021-03-18 16:48:26 -04:00
Isaac Connor 2a6621959c We CANNOT specify nextId for the next mid to use. If we do that then we can overwrite existing db entries 2021-03-13 12:47:05 -05:00
Isaac Connor 9d33688f89 Honour various permissions on what's in the navbar. 2021-03-12 11:40:46 -05:00
Isaac Connor e5f9654e50 honour Groups:View permission in monitor filters 2021-03-12 11:33:16 -05:00
Isaac Connor 1ae1a89abf Only allow show zones for System::View permission 2021-03-12 10:29:13 -05:00
Isaac Connor ba00bee4b8 fix header alignment 2021-03-12 10:07:33 -05:00
Isaac Connor 70073ea017 Add thumbnails to snapshots list 2021-03-12 10:07:17 -05:00
Isaac Connor 11c2318a05 Rough in the ui for Snapshots 2021-03-12 09:28:05 -05:00
Isaac Connor 6682ec7da5 Add Snapshots and Snapshot_Events Tables. Add HomeView to Users. 2021-03-12 09:26:23 -05:00
Isaac Connor 8aebcf7337 Fix ['mid'] not being defined. Use instead 2021-03-03 12:51:27 -05:00
Isaac Connor ce4e133c94 Add loading SecondPath in monitor 2021-03-03 09:56:33 -05:00
Isaac Connor 95fe689d58 WIP, rabbit hole too deep 2021-03-03 09:55:57 -05:00
Isaac Connor bb747bfc6d Add RTSPStreamName fields 2021-03-01 16:46:48 -05:00
Isaac Connor 445d815071 fix eslint 2021-02-25 20:35:45 -05:00
Isaac Connor d106c2fcc3 Add 4MP and 6MP resoolutions 2021-02-24 15:03:11 -05:00
Isaac Connor 0d2febc958 Make monitor column open the event instead of monitor edit 2021-02-24 12:38:12 -05:00
Andrew Bauer c8be0d58d5 eslint - fix whitespace 2021-02-22 19:02:24 -06:00
Isaac Connor 82c4a1a417 put third refresh button back for now 2021-02-22 11:57:27 -05:00
Isaac Connor 3a8e2ff869 Hide duplicated refresh button 2021-02-22 11:25:00 -05:00
Isaac Connor 9aad09a735 Refresh bootstrap table if the ajax fails. 2021-02-22 11:24:30 -05:00
Isaac Connor 9fec32fdc5 We now support audio when doing video encoding 2021-02-22 09:55:40 -05:00
Andrew Bauer 3fb1054093 bstable export requires tableExport plugin 2021-02-18 20:22:19 -06:00
Isaac Connor ba6797a143 make definitionPanel have height to fix jumping around as scroll bar appears/disappears 2021-02-18 10:25:05 -05:00
Isaac Connor f0d8a654f8 Remove debug, use fewer lines 2021-02-17 13:11:55 -05:00
Isaac Connor aa94795b96 When auth is not turned on, show an error instead of login fields. 2021-02-16 16:09:23 -05:00
Isaac Connor 317274248b Allow mid= and dupId= in monitor view to allow mid reuse. Alphabetically sort Monitors in LinkedMonitors by name 2021-02-16 14:16:59 -05:00
Isaac Connor 71183a6002 fix case of vidWidth. Fixes #3162 2021-02-14 16:28:08 -05:00
Isaac Connor 231c9303fd Handle null vidWidth 2021-02-11 11:50:05 -05:00
Isaac Connor 470739e1d5 Add debugging if streamStatus.status doesn't exist 2021-02-09 14:24:09 -05:00
Isaac Connor 79ac92c76d spacing 2021-02-09 14:23:47 -05:00
Isaac Connor d4e83620b2 Split actions and options columns into 50% 2021-02-03 12:57:17 -05:00
Isaac Connor a7365323dd Split actions and options in filters to fit more horizontally 2021-02-03 12:57:17 -05:00
Isaac Connor c35869fd30 Use jquery offset() to get image position 2021-02-02 23:19:53 -05:00
Isaac Connor c8af90fd24 Add RTSP Server checkbox 2021-02-02 23:19:52 -05:00
Isaac Connor 2996fe3da7 fix hiding cloneBtn 2021-02-02 23:19:52 -05:00
Isaac Connor b35e27d0b6 Use decodeURIComponent instead of decodeURI 2021-02-02 09:12:34 -05:00
Isaac Connor 49d3e5ddbf decodeURI row.Message 2021-02-02 09:09:53 -05:00
Isaac Connor 49209d9e72 populate mid if specified to enable reusing mids. Fix auto-populating resolution dropdown 2021-02-01 16:45:13 -05:00
Isaac Connor a3fe577fc6 Fix margin in ptz buttons 2021-01-31 11:45:11 -05:00
Isaac Connor ee5d5e3cab wrap fps text in another div to make the title easier to bring up and include the word fps 2021-01-31 10:19:10 -05:00
Isaac Connor 69b9e40b59 Fix textstatus=>textStatus 2021-01-31 10:09:22 -05:00
Isaac Connor 4ba939e267 role=tabList needs to be role=tablist 2021-01-29 20:37:55 -05:00
Isaac Connor 927d11a6a4 Fix tags not allowed under ul 2021-01-29 20:37:34 -05:00
Isaac Connor c444e5cf07 spacing 2021-01-29 14:05:04 -05:00
Isaac Connor ec1a7ec427 scale the event width when calculating if the stats table will fit 2021-01-29 14:03:12 -05:00
Isaac Connor 379538b3db Make the monitor name at the top a link to monitor edit 2021-01-29 09:53:30 -05:00
Isaac Connor ae41998d7c Add a check for passthrough and not ffmpeg 2021-01-29 09:53:11 -05:00
Isaac Connor 5524090a80 Remove sleep function. Not going to work anyways 2021-01-28 16:17:15 -05:00
Isaac Connor 6bfbb5462a console monitor sort must be a post 2021-01-27 11:48:32 -05:00
Isaac Connor 7dd9188b3b fix eslint 2021-01-26 18:09:19 -05:00
Isaac Connor bacf4a1aca Add 640x360 resolution 2021-01-26 17:54:22 -05:00
Isaac Connor 410b9840d1 fix eslint 2021-01-26 17:44:23 -05:00
Isaac Connor 69626651ff ImageBufferCount can now be as low as 2 2021-01-26 15:33:38 -05:00
Isaac Connor 4dcce4ac95 Merge branch 'rtsp_server' 2021-01-26 14:22:10 -05:00
Isaac Connor dc9c7a7e15 handle event not existing a little better. 2021-01-25 18:49:03 -05:00
Isaac Connor 4b5052c351 use my bindButton function on the othe rbuttons 2021-01-25 18:48:47 -05:00
Isaac Connor 1b9f448aca handle event not existing a little better. Show back button for example. 2021-01-25 18:48:20 -05:00
Isaac Connor ea8f264724 Merge branch 'release-1.34' 2021-01-22 15:54:06 -05:00
Isaac Connor d3c84a168a Remove the word All from the mark column on console. I think the UX is pretty universal by now. 2021-01-22 15:51:31 -05:00
Isaac Connor cd9f10695d correct colours in links, navbar buttons. sync colours of monitor filter text inputs to match chosen dropdown. make options sidebar black. Remove redundant layout duplicated from base. 2021-01-22 15:51:04 -05:00
Isaac Connor c7ef587d5d Shirnk colMark because I got rid of the word All in the header. Make the monitor filters inline-block which makes them flow with their label when narrow 2021-01-22 15:47:44 -05:00
Isaac Connor 436cd3397b apply a top/bottom margin to buttons of 1px to create a tiny space between buttons and console table. Remove commented out styles 2021-01-22 15:46:48 -05:00
Andrew Bauer e3fdfa659a fix typo and disable settings btn rather than hide 2021-01-19 10:32:18 -06:00
Andrew Bauer c13d2ea99f make watch view event list more efficient 2021-01-19 10:10:51 -06:00
Andrew Bauer 68819a86a0 remove mootools from zoneminder 2021-01-18 07:31:43 -06:00
Isaac Connor cb90c06cde Merge branch 'master' into zma_to_thread 2021-01-17 17:38:34 -05:00
Isaac Connor 5186ae2433 use bindButton 2021-01-16 13:17:46 -05:00
Isaac Connor 3dc35c49a2 quotes 2021-01-16 13:17:46 -05:00
Isaac Connor d98dde4aee Use auth hash in event loading. Use monitorURL in ajax calls that need to talk to zms. Use bindButton to handle the non-existence of settings button. 2021-01-16 13:17:46 -05:00
Isaac Connor 6586aa6338 Introduce a helper function bindButton to do the button event binding with nice error logging. 2021-01-16 13:17:46 -05:00
Isaac Connor 1e59c5bbde Merge branch 'release-1.34' 2021-01-15 18:46:07 -05:00
Isaac Connor f2fea95f4b Merge branch 'master' into zma_to_thread 2021-01-14 13:02:52 -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 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 8de122ef26 remove await that we can't use 2021-01-12 14:13:42 -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 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 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 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
Andrew Bauer 774d522cee eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer a1678f5ea4 replace mootool Cookie object with plain JS 2021-01-11 13:46:50 -05:00
Andrew Bauer d2cc65c8a3 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer a6964f66e2 use JS instead of Mootools to detect IE browser 2021-01-11 13:46:50 -05:00
Andrew Bauer fe8561d868 replace mootools periodical method 2021-01-11 13:46:50 -05:00
Isaac Connor 6d9fa27b37 Fix changeScale not updating zms url when the page initially loads as not scale to fit 2021-01-11 13:46:50 -05:00
Isaac Connor 0db759ede1 split long line 2021-01-11 13:46:50 -05:00
Andrew Bauer 1b385ee195 show alarm state and fps on zones view 2021-01-11 13:46:50 -05:00
Andrew Bauer 29f3e9007a replace mootools in MonitorStream 2021-01-11 13:46:50 -05:00
Andrew Bauer 70f73f5475 modernize monitors view 2021-01-11 13:46:50 -05:00
Andrew Bauer cf10ce010c tableExport plugin is no longer used 2021-01-11 13:46:50 -05:00
Andrew Bauer aeec7b025d remove js files that define popupSizes 2021-01-11 13:46:50 -05:00
Andrew Bauer 5c6e093b13 old overlay code is no longer used 2021-01-11 13:46:50 -05:00
Andrew Bauer 69268f79a4 remove obsolete controlpreset js files 2021-01-11 13:46:50 -05:00
Andrew Bauer 590d65671c WIP jquery conversion 2021-01-11 13:46:50 -05:00
Andrew Bauer ad3894ab1b WIP replace with jquery 2021-01-11 13:46:50 -05:00
Andrew Bauer 4ade926df4 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer d25d2b4894 replace mootools in montagereview.js 2021-01-11 13:46:50 -05:00
Andrew Bauer 3d77069b0b bring montage minimize chervron into the view 2021-01-11 13:46:50 -05:00
Andrew Bauer 113d2d1797 replace mootools in montage.js 2021-01-11 13:46:50 -05:00
Andrew Bauer 0a5d6ca4ba replace mootools in cycle.js 2021-01-11 13:46:50 -05:00
Andrew Bauer ddce421cab eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer cb6bf682e8 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer d9a97fbf40 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer 6f78b5a105 eslint 2021-01-11 13:46:50 -05:00
Andrew Bauer b95f1baa96 WIP replace mootools in zone.js 2021-01-11 13:46:50 -05:00
Andrew Bauer e6a6c1b52f WIP replace mootools in zone.js 2021-01-11 13:46:50 -05:00
Andrew Bauer 0dbeb89c62 remove replace mootools in drawZonePoints function 2021-01-11 13:46:50 -05:00
Andrew Bauer dcda8cb679 handle objdetect links in a more consistent manner 2021-01-11 13:46:50 -05:00
Andrew Bauer a8f79a6e00 prevent page scrolling when objdetect modal is opened 2021-01-11 13:46:50 -05:00
Andrew Bauer 6da429f49f remove redundant modal toggle from events.js 2021-01-11 13:46:50 -05:00
rabsym 56bb4a74fc Avoid top-scroll when returning from bs_modal objdetect 2021-01-11 13:46:50 -05:00
Andrew Bauer e27dd44547 upgrade to bootstrap-table 18.1 release 2021-01-11 13:46:50 -05:00
Isaac Connor f7de6045ef Change Disabled to Auto and add h265 as codec options 2021-01-11 13:46:50 -05:00
Andrew Bauer 9e9860d6c0 replace mootools getelement and addevent 2021-01-11 09:06:21 -06:00
Andrew Bauer 2094f78adf use plain js to get the livestream rather than mootools 2021-01-11 07:27:11 -06:00
Andrew Bauer ff7a1037be use plain js for mouseover thumb animation 2021-01-11 07:21:51 -06:00
Andrew Bauer 4a2b3e569b increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback 2021-01-10 13:02:07 -06:00
Andrew Bauer d45b4ca434 deprecate legacy "stills" option from event view 2021-01-10 10:25:22 -06:00
Andrew Bauer 2e0b32b2fc add a button to go to the stats view 2021-01-09 16:13:33 -06:00
Andrew Bauer 08d640a06c autohide frame stats when out of pixels 2021-01-09 16:01:32 -06:00
Andrew Bauer 1ea4ee6ef1 remove extra uneeded on change event handler 2021-01-09 15:09:20 -06:00
Andrew Bauer 9cb1709f77 fix frame view scale control 2021-01-09 15:08:08 -06:00
Andrew Bauer e415118f77 clean up postlogin js 2021-01-09 14:40:38 -06:00
Andrew Bauer 22be24ccde eslint 2021-01-09 08:54:13 -06:00
Andrew Bauer 4eeb0a90f6 remove unneeded comment 2021-01-09 08:45:20 -06:00
Andrew Bauer df44afb164 autohide the event stats when out of pixels 2021-01-09 08:43:53 -06:00
Andrew Bauer a55e53a737 replace mootools Request.JSON 2021-01-08 14:34:10 -06:00
Andrew Bauer ece8fccc63 fix cyclePrev with only 1 monitor 2021-01-08 13:16:16 -06:00
Andrew Bauer c7690a7088 go back rather than close window 2021-01-08 12:40:26 -06:00
Andrew Bauer 9ec09c0c85 replace mootools .delay method 2021-01-08 12:25:17 -06:00
Andrew Bauer c0431eca86 eslint 2021-01-08 10:42:45 -06:00
Andrew Bauer f816c72517 replace mootool Cookie object with plain JS 2021-01-08 10:04:46 -06:00
Andrew Bauer d0f035596c eslint 2021-01-08 08:50:57 -06:00
Andrew Bauer d3a71aff14 use JS instead of Mootools to detect IE browser 2021-01-08 08:27:06 -06:00
Andrew Bauer 43fabd9b65 replace mootools periodical method 2021-01-08 07:32:52 -06:00
Andrew Bauer 4756a03b16 show alarm state and fps on zones view 2021-01-06 14:27:06 -06:00
Andrew Bauer 9d7f738f61 replace mootools in MonitorStream 2021-01-06 14:19:25 -06:00
Andrew Bauer 6dcedb584d modernize monitors view 2021-01-05 10:16:51 -06:00
Andrew Bauer ebbd2888f0 tableExport plugin is no longer used 2021-01-04 15:40:53 -06:00
Andrew Bauer bd18904bf4 remove js files that define popupSizes 2021-01-04 15:33:26 -06:00
Andrew Bauer 51132cb5e1 old overlay code is no longer used 2021-01-04 13:51:03 -06:00
Andrew Bauer 0cdc2b448d remove obsolete controlpreset js files 2021-01-04 13:18:05 -06:00
Andrew Bauer 75e2f526ae WIP jquery conversion 2021-01-04 13:05:33 -06:00
Andrew Bauer a1b26c8f61 WIP replace with jquery 2021-01-04 10:28:16 -06:00
Andrew Bauer 21180777b4 eslint 2021-01-03 14:23:13 -06:00
Andrew Bauer 49a535abaa replace mootools in montagereview.js 2021-01-03 11:45:53 -06:00
Andrew Bauer 0dd98855cc bring montage minimize chervron into the view 2021-01-03 08:53:07 -06:00
Andrew Bauer 1f6b2798ff replace mootools in montage.js 2021-01-03 07:40:50 -06:00
Andrew Bauer 1ab181ec54 replace mootools in cycle.js 2021-01-02 16:57:23 -06:00
Andrew Bauer 5ad8e90dda
eslint 2021-01-02 13:48:40 -06:00
Andrew Bauer f0610b5eb7
eslint 2021-01-02 13:25:38 -06:00
Andrew Bauer 809e67d352 eslint 2021-01-02 12:24:12 -06:00
Andrew Bauer e9bdaa988e eslint 2021-01-02 12:06:02 -06:00
Andrew Bauer cc69b150de WIP replace mootools in zone.js 2021-01-02 11:58:03 -06:00
Andrew Bauer 62575c0d0e WIP replace mootools in zone.js 2021-01-02 11:33:21 -06:00
Andrew Bauer ebad6194ee remove replace mootools in drawZonePoints function 2021-01-02 10:52:17 -06:00
Andrew Bauer 12c0ccea7c handle objdetect links in a more consistent manner 2021-01-02 08:52:26 -06:00
Andrew Bauer a61da04969 prevent page scrolling when objdetect modal is opened 2021-01-02 08:06:35 -06:00
Andrew Bauer ea7184e619
remove redundant modal toggle from events.js 2021-01-01 09:36:49 -06:00
rabsym b7970d69a5 Avoid top-scroll when returning from bs_modal objdetect 2021-01-01 14:15:35 +01:00
Steve Gilvarry 7c783aa53d
Deal with Error for Auto not in Array
Add value auto into the array, even if not implemented as without it you cannot save a monitor.
2021-01-01 14:38:33 +11:00
Andrew Bauer bc30d303f7 upgrade to bootstrap-table 18.1 release 2020-12-30 08:01:28 -06:00
Isaac Connor 284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Andrew Bauer 2adeedf418 additional mootools cleanup in event.js 2020-12-25 07:19:41 -06:00
Andrew Bauer 5fa8cbf158 add Frames button to event view 2020-12-24 14:46:13 -06:00
Andrew Bauer e66b050c72 WIP jquery conversion of event view 2020-12-24 10:38:44 -06:00
Andrew Bauer b093e99688 disable click to select on the events table Cause column 2020-12-24 07:10:47 -06:00
Andrew Bauer 816c306518 use jquery for submitTab 2020-12-23 12:29:39 -06:00
Andrew Bauer a94550795b update setButtonState 2020-12-23 12:20:31 -06:00
Andrew Bauer f64f3262ed WIP replace mootools in evnet.js 2020-12-23 12:19:35 -06:00
Andrew Bauer f857d12103 WIP replace mootools in event.js 2020-12-23 10:51:23 -06:00
Andrew Bauer 493bfa6a16 eslint 2020-12-23 09:15:31 -06:00
Andrew Bauer 3c79204592 replace mootools in add_monitors 2020-12-23 08:54:11 -06:00
Isaac Connor 286a5a72a3 Merge branch 'master' into zma_to_thread 2020-12-23 09:47:31 -05:00
Andrew Bauer c91a0b2c09 fixup jquery click functions 2020-12-23 08:37:28 -06:00
Andrew Bauer c497b94378 use tlzoom class to avoid conflict with thumbnail zoom 2020-12-23 07:57:44 -06:00
Andrew Bauer a9b92905ca eslint 2020-12-22 19:07:12 -06:00
Isaac Connor a1917d83d0 Merge branch 'master' into zma_to_thread 2020-12-22 19:52:09 -05:00
Andrew Bauer cc5a732103 continue work on timeline.js 2020-12-22 16:06:21 -06:00
Isaac Connor 6be9b294ef Hidden and hidden are two very different classes 2020-12-22 17:00:07 -05:00
Andrew Bauer 8a26252914 update object detected link in events 2020-12-22 12:42:27 -06:00
Andrew Bauer 9af383db92 set the width style for the objdetect modal 2020-12-22 12:30:44 -06:00
Andrew Bauer ee45916526 move objdetect image to a modal 2020-12-22 10:08:31 -06:00
Isaac Connor a231125fb3 Replace Download with a direct link to the mp4 like it used to be. Add back a Frames link 2020-12-22 10:23:44 -05:00
Andrew Bauer cbe04674c5 remove non-existent id preview 2020-12-21 15:59:05 -06:00
Andrew Bauer d080109f4b eslint 2020-12-21 15:20:38 -06:00
Andrew Bauer 663748d9a7 partial replace mootools 2020-12-21 13:07:14 -06:00
Andrew Bauer 1f3fd93296 use setTimeout instead of mootools pass 2020-12-20 15:21:38 -06:00
Andrew Bauer 92361210ce eslint 2020-12-20 15:07:16 -06:00
Andrew Bauer 1d6c4664dc replace mootools in export 2020-12-20 10:54:18 -06:00
Andrew Bauer 0b569e7e37 replace mootools in control.js 2020-12-20 08:29:39 -06:00
Andrew Bauer 66ae2c0461 replace mootools request JSON 2020-12-20 07:59:17 -06:00
Isaac Connor 0104e2ba7f Add a sorted_monitor_ids array to use when generating sorted lists of monitors. Return proper json when things aren't set instead of empty string. Use sorted_monitor_ids to populate the monitor dropdown in filters 2020-12-18 10:23:41 -05:00
Isaac Connor 8d52baeee2 Merge branch 'master' into rtsp_server
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1.  0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
Isaac Connor a855656b88 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-12-17 09:27:23 -05:00
Isaac Connor 5602b92699 Fix issue with timeline where it only shows first frame 2020-12-17 09:26:59 -05:00
Isaac Connor 7f9b977ec2 rename onDownClick to onRenameClick cutnpaste error 2020-12-15 16:57:27 -05:00
Isaac Connor 8c85c50ce1 Add titles to fps values and only show analysis if doing it 2020-12-15 16:56:53 -05:00
Isaac Connor 997a05eb8b AV_CODEC_ID for H264 is 27 not 220 2020-12-15 16:56:27 -05:00
Isaac Connor 7dc4633d27 rename onDownClick to onRenameClick cutnpaste error 2020-12-15 16:56:05 -05:00
Isaac Connor 48db741b4e Fix merge from master 2020-12-15 15:59:02 -05:00
Isaac Connor de38c29e83 Fix lack of # for zoomvalue 2020-12-15 15:56:41 -05:00
Isaac Connor e123322d06 Merge branch 'master' into rtsp_server 2020-12-15 11:00:13 -05:00
Isaac Connor 99e7ae3505 Merge branch 'master' into rtsp_server 2020-12-15 10:14:19 -05:00
Isaac Connor aed83cab31 Load delconfirm content on demand 2020-12-15 10:11:30 -05:00
Isaac Connor bc07c38dc8 add 704x576 PAL D1 2020-12-14 12:57:59 -05:00
Andrew Bauer 191e213337 upgrade to jquery 3.5.1, use minified javascripts 2020-12-14 10:02:43 -06:00
Andrew Bauer a5b945f97a touch up event view stat list 2020-12-14 06:55:45 -06:00
Andrew Bauer 4ae47659df use js to build event stats 2020-12-13 21:19:38 -06:00
Isaac Connor 43d0b0fd55 Add D1-PAL resolution 2020-12-13 16:47:51 -05:00
Andrew Bauer 48c6309394 add emailed & archived status to event view 2020-12-13 15:01:47 -06:00
Andrew Bauer 882447317a eslint 2020-12-13 14:42:39 -06:00
Andrew Bauer c24564e0cd insert frame stats into frame view 2020-12-13 13:20:26 -06:00
Andrew Bauer 71d1607f69 fix php -> js issue when $alarmframe was false 2020-12-12 15:06:59 -06:00
Andrew Bauer 237335c022 watch.js - finish mootools replacement 2020-12-12 12:45:36 -06:00
Isaac Connor 51a862057f Fix a link missing a quote 2020-12-11 09:49:43 -05:00
Isaac Connor c26fc1f36a Replace thisUrl with the export ajax request as a GET parameter, making it easier to find inlogs. 2020-12-11 09:42:35 -05:00
Isaac Connor 3483ee8db1 clean up code a little by make an event_link string and using it. Fix the cause column not being a valid link. I think it used to popup an edit but it should just go to the event view 2020-12-11 09:34:50 -05:00
Isaac Connor 77a35c1813 right align colDiskSpace so that digits line up nicely 2020-12-11 09:33:54 -05:00
Isaac Connor 8bda0b5504 fix element name on DecodingEnabled 2020-12-10 16:24:45 -05:00
Isaac Connor c37433acfc show/hide DecodingEnabled depending on function 2020-12-10 16:24:33 -05:00
Isaac Connor 5c1135b2a7 Merge branch 'master' into no_decode 2020-12-10 15:15:32 -05:00