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

3516 Commits

Author SHA1 Message Date
Isaac Connor da8128aba1 Merge branch 'master' into add_manufacturer_model_to_monitors 2021-05-07 19:16:35 -04:00
Isaac Connor ff0d6e8e0f remove duplicated getModal and pass fid=fid to getModal 2021-05-07 15:34:08 -04:00
Isaac Connor 9e6367c7c3 look for 264 instead of x264 2021-05-06 17:33:04 -04:00
Isaac Connor 373fae2511 BadEncoder Params and PathNotEncoded are warnings, not errors 2021-05-06 11:05:05 -04:00
Isaac Connor b8f0d90000 Put back Estimated Ram Use. Rework it to provide min/max 2021-05-06 10:17:46 -04:00
Isaac Connor 0adc2d96d6 Revert "remove estimated ram use stuff as it is no longer possible" 
This reverts commit 2e675a338b.
 2021-05-06 09:54:06 -04:00
Isaac Connor f4bbacb3f4 add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc 2021-05-05 16:48:49 -04:00
Isaac Connor 2dfe66663d Remove mjpeg and mpeg options. They don't make sense. Add classes so we can hide Encoder and OutputContainer options 2021-05-05 14:03:02 -04:00
Isaac Connor 0b6e414998 Enable/Disable Snapshots based on ZM_FEATURES_SNAPSHOTS config setting 2021-05-04 13:19:40 -04:00
Isaac Connor 24d9bfa257 Add a test for invalid characters in Path for Ffmpeg monitors 2021-05-04 10:45:27 -04:00
Isaac Connor d92c95a420 if analysis frame doesn't exist revert back to capt 2021-05-03 15:18:35 -04:00
Isaac Connor b70cd053d6 spacing and quotes 2021-05-02 12:43:17 -04:00
Peter Keresztes Schmidt 1dbfa0790a web: fix eslint errors 2021-04-24 01:42:13 +02:00
Isaac Connor f59904ea7e Add ModectDuringPTS checkbox on Control tab 2021-04-23 14:52:29 -04:00
Isaac Connor 4d9fb5b225 Don't show live thumbnail if we do not have Stream permission. Do not show groups if not view permission. Do not make them links to montage if no stream permission 2021-04-23 09:51:38 -04:00
Isaac Connor 506e5f84c9 Remove getCurrentLocation label that says Longitude 2021-04-19 15:45:18 -04:00
Isaac Connor d598edc7df Implement duplicate RTSPSTreamName check 2021-04-17 12:50:26 -04:00
root f3ea08c4a1 Merge branch 'continuous' into cont_mast 2021-04-16 11:27:48 -04:00
Isaac Connor c880618d5f If no button is associated with the event, assume it is a mouseup 2021-04-16 10:24:48 -04:00
Isaac Connor 04cc8ed34f Split user info into two columns 2021-04-12 15:59:31 -04:00
Isaac Connor f3773a89ad Add Snpahot permission 2021-04-12 15:59:31 -04:00
Isaac Connor f59a72a638 Use Snapshots permission instead of Events permission for Snapshots 2021-04-12 15:59:31 -04:00
Isaac Connor 7e579fd851 Implement Snapshots user permission 2021-04-12 15:59:31 -04:00
Isaac Connor a3078d61f7 Default monitor filter bar to showing. Remove container-fluid which was adding padding at right and left. It should go elsewhere if needed. 2021-04-12 15:59:31 -04:00
Isaac Connor ed29021179 Rough in an importance setting in monitor that we can use to decrease the log level of certain events like PrimeCapture for cameras that we don't care about 2021-04-11 12:59:18 -04:00
Isaac Connor 64ab6dff95 fix missing ) 2021-04-10 18:16:59 -04:00
Isaac Connor 1ccb8d7aef Include Event Summaries when loading Monitors 2021-04-09 19:46:57 -04:00
Isaac Connor 2b1e0df6be FIx auth= not getting updated 2021-04-09 18:46:41 -04:00
Isaac Connor 492a352bed Use updated auth_hash when sending alarm requests 2021-04-09 18:33:32 -04:00
Isaac Connor 73082a2d33 Remove the H264/X264 from the dropdown labels. Could be H265 or other 2021-04-01 11:53:57 -04:00
Isaac Connor ba9acd3037 Add test for no encoder settings 2021-04-01 11:53:57 -04:00
Isaac Connor 790cdf879a Add D1-PAL resolution 2021-03-31 11:05:17 -04:00
Isaac Connor e9641938f0 Fix eslint 2021-03-27 18:25:04 -04:00
Isaac Connor 96e641b381 handle if error message doesn't exist 2021-03-27 13:42:00 -04:00
Isaac Connor 4ee3380e3a If auth is not turned on, redirect to console 2021-03-27 13:41:49 -04:00
Isaac Connor 8e1b2ccbc7 Add MaxImageBufferCount 2021-03-26 17:02:17 -04:00
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 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 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
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 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 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
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 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 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 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 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
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
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 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 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 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 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 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 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
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 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 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