Commit Graph

4182 Commits

Author SHA1 Message Date
Isaac Connor 2e675a338b remove estimated ram use stuff as it is no longer possible 2021-03-26 14:31:18 -04:00
Isaac Connor badb1c6131 Add MaxImageBufferCount, remove estimated ram us 2021-03-26 14:31:04 -04:00
Isaac Connor c78e6a7cc7 Fix scroll bars on options view 2021-03-26 08:16:15 -04:00
Isaac Connor 4fab9fe458 fix error due to missing columns 2021-03-25 17:29:35 -04:00
Isaac Connor 37a8f007c8 remove unised function 2021-03-23 13:53:25 -04:00
Isaac Connor 16b33536ed Turn off second Log in header 2021-03-22 17:49:59 -04:00
Isaac Connor 1dc32a0eed Use getBodyTopHTML so that we get error reporting 2021-03-22 13:00:08 -04:00
Isaac Connor c7b22dae81 get rid of nextId entirely. Don't want to use it anywhere other than setting the name 2021-03-22 12:07:23 -04:00
Isaac Connor 613ed1faf2 Update estimated ram use when we use the dropdown to change resolution 2021-03-22 12:06:48 -04:00
Isaac Connor be653980f3 fix eslint 2021-03-21 18:17:13 -04:00
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