Commit Graph

526 Commits

Author SHA1 Message Date
zhiyang7 35ca55e4eb Add hevc wasm player 2022-03-09 15:57:12 +08:00
Isaac Connor a0b60aa4f7 Restore inclusion of video files in export when not including images. Fixes #3324 2021-11-17 11:04:48 -05:00
Isaac Connor f5b54caa61 Improvements to export. Fix tar -v, should be tar --version. make table width:100% and iframe height 100%. Always show thumbnail of video. Show Id of event if no other links. generate Images frame content event if no jpegs but there is an mp4. Set timeout to infinity for generating export. Provide more feedback if it breaks. Fix ticker. 2021-10-19 13:11:31 -04:00
Isaac Connor 12fcae7574 canView takes a user object, not a string 2021-09-08 19:08:08 -04:00
Isaac Connor 4c261eb413 Use event->canView so that events in snapshots can be exported 2021-09-03 22:26:26 -04:00
Isaac Connor c089702fab Pass exportStructure around so that it can be used to put the right filename to the jpg in the html. Fix flat zips. Fix video files being included if exportMisc is true. 2021-09-03 22:19:02 -04:00
Isaac Connor 6a6d6935e8 Merge script sections just to remove bytes per view. 2021-09-03 22:15:56 -04:00
Isaac Connor 2273deaf17 Support specifying the export filename by passing the export_root 2021-09-03 22:14:42 -04:00
Isaac Connor 06ff94de2f Fix styling of the shutdown button 2021-09-03 22:13:55 -04:00
Isaac Connor 13da1aca14 Remove 25x and options. Browsers do not support them. Add 16x which is the max. Fixes #3284 2021-06-08 13:37:40 -04:00
Isaac Connor f6fcc2144f jquery.js doesn't exist, so link jquery.min.js instead 2021-05-22 13:59:32 -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 df26c25ac9 Add continuous mouseup/down functionailty for Zoom,White,Iris,Focus 2021-04-17 16:32:06 -04:00
root 23f1b68e8a Merge branch 'continuous' into cont_mast 2021-04-16 11:28:10 -04:00
root f3ea08c4a1 Merge branch 'continuous' into cont_mast 2021-04-16 11:27:48 -04:00
Isaac Connor 3d1b0e2724 Apply onmouseup/down to other ptz buttons 2021-04-16 11:27:08 -04:00
Isaac Connor d7fa28142f Use on-mousedown and on-mouseup if doing continuous 2021-04-16 10:15:07 -04:00
Isaac Connor f59a72a638 Use Snapshots permission instead of Events permission for Snapshots 2021-04-12 15:59:31 -04:00
Isaac Connor 80e5076d2a cache bust jquery and bootstrap 2021-03-31 18:27:43 -04:00
Isaac Connor 16b33536ed Turn off second Log in header 2021-03-22 17:49:59 -04:00
Isaac Connor 9d33688f89 Honour various permissions on what's in the navbar. 2021-03-12 11:40:46 -05:00
Isaac Connor 6682ec7da5 Add Snapshots and Snapshot_Events Tables. Add HomeView to Users. 2021-03-12 09:26:23 -05:00
Andrew Bauer 3fb1054093 bstable export requires tableExport plugin 2021-02-18 20:22:19 -06:00
Isaac Connor 927d11a6a4 Fix tags not allowed under ul 2021-01-29 20:37:34 -05:00
Isaac Connor 4dcce4ac95 Merge branch 'rtsp_server' 2021-01-26 14:22:10 -05:00
Andrew Bauer 68819a86a0 remove mootools from zoneminder 2021-01-18 07:31:43 -06: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
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 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
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
Andrew Bauer 191e213337 upgrade to jquery 3.5.1, use minified javascripts 2020-12-14 10:02:43 -06:00
Andrew Bauer 5665eb14f5 fix bw select again 2020-12-03 19:33:10 -06:00
Isaac Connor 1c10cc492b Fix StartTime to StartDateTime 2020-12-02 13:15:32 -05:00
Andrew Bauer aac47ed361 fixes to export functions 2020-12-02 12:02:24 -06:00
Andrew Bauer b0da7f5920 fix navbar bandwidth dropdown 2020-12-01 10:27:08 -06:00
Andrew Bauer 442fadb585 link bstable locale to zoneminder's 2020-10-17 07:28:14 -05:00
Andrew Bauer 4044d60412 update bstable to 9fa4c82, add bstable locale extenstion 2020-10-17 07:23:26 -05:00
Isaac Connor c5cd617204 Load logoutModal on click instead of always 2020-10-16 14:51:47 -04:00
Isaac Connor 12b75e93b8 Merge branch 'release-1.34' 2020-10-15 17:19:56 -04:00
Isaac Connor 7bb227283d Update rates in includes/config.php 2020-10-15 17:15:54 -04:00
Isaac Connor 10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Andrew Bauer ed5f6b2625 convert shutdown popup to modal 2020-10-12 12:16:52 -05:00
Andrew Bauer 802e439cb5 convert controlpreset view to a modal 2020-10-02 15:46:28 -05:00
Andrew Bauer e26e36606f update version check logic in navbar 2020-10-01 08:46:58 -05:00