Commit Graph

8079 Commits

Author SHA1 Message Date
Isaac Connor 71c29afa7b Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-15 09:47:34 -05:00
Isaac Connor c84f42e280 Set to never timeout while generating video 2021-11-12 15:11:48 -05:00
Isaac Connor 8872b8be63 spacing 2021-11-12 15:11:48 -05:00
Isaac Connor 795c5bb7d7 setScale to auto 2021-11-12 15:11:48 -05:00
Isaac Connor ac03a88550 Include url_to_zms in monitorData 2021-11-12 15:11:48 -05:00
Isaac Connor 529e889d99 remove extra , 2021-11-12 15:11:48 -05:00
Isaac Connor 14e578cdb2 Implement Exit Fullscreen using same button 2021-11-12 15:11:48 -05:00
Isaac Connor a7fd65d844 Put SCALE_BASE in skin.js.php as it is used in many places. 2021-11-12 15:11:48 -05:00
Isaac Connor 6f3e22f2a0 If no bottom element is specified, take the last child of content in scaleToFit 2021-11-12 15:11:48 -05:00
Isaac Connor 8d0463bbff Implement getElement, setScale in MonitorStream.js 2021-11-12 15:11:48 -05:00
Isaac Connor 98e29e7ef6 implement UrlToZMS in Monitor 2021-11-12 15:11:48 -05:00
Isaac Connor dc9f7b4d1d Rough in fullscreen mode on montage 2021-11-12 15:11:48 -05:00
Isaac Connor acff4fb9c0 rough in fullscreen mode in watch view 2021-11-12 15:11:48 -05:00
Isaac Connor 71931f007a alert error message is an error is returned instead of rows 2021-11-12 15:11:48 -05:00
Isaac Connor 944c04e5b4 Whitespace 2021-11-12 15:11:48 -05:00
Isaac Connor 9036728bdc Report error if sql fails. Add check for access to specific event. 2021-11-12 15:11:48 -05:00
Isaac Connor 3ac5402699 Pretty up the v4l field names 2021-11-12 15:11:48 -05:00
Isaac Connor caeaf91cad Only list available ids if there are some 2021-11-12 15:11:48 -05:00
Isaac Connor 1561adbef9 Add title to Download button 2021-11-12 15:11:41 -05:00
Isaac Connor 193f349e38 implement Event::canEdit 2021-11-12 13:37:01 -05:00
Isaac Connor 6d30f5431b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-11-11 13:58:56 -05:00
Isaac Connor a0215067e4 In multi-server when viewing an event it may be coming from a different server than the serverhost. Use monitorUrl instead of thisUrl in ajax calls and include auth data. Fixes failed ajax when viewing h264 using zms on a multi-server environment 2021-11-11 13:58:52 -05:00
Isaac Connor 721769993b Set to never timeout while generating video 2021-11-10 17:05:46 -05:00
Isaac Connor 2c0c257d76 spacing 2021-11-10 14:25:45 -05:00
Isaac Connor 0732d4c1b3 setScale to auto 2021-11-10 14:25:29 -05:00
Isaac Connor 377219befe Include url_to_zms in monitorData 2021-11-10 14:25:12 -05:00
Isaac Connor ed84b59671 remove extra , 2021-11-10 14:23:36 -05:00
Isaac Connor 5d0bd978e4 Implement Exit Fullscreen using same button 2021-11-10 14:22:05 -05:00
Isaac Connor 43c1886267 Put SCALE_BASE in skin.js.php as it is used in many places. 2021-11-10 14:21:38 -05:00
Isaac Connor b8f6172110 If no bottom element is specified, take the last child of content in scaleToFit 2021-11-10 14:21:12 -05:00
Isaac Connor 474f65cff3 Implement getElement, setScale in MonitorStream.js 2021-11-10 14:20:19 -05:00
Isaac Connor 4c2d50c1f4 implement UrlToZMS in Monitor 2021-11-10 14:18:58 -05:00
Isaac Connor f263da8986 Rough in fullscreen mode on montage 2021-11-09 17:01:13 -05:00
Isaac Connor 30d4900b45 rough in fullscreen mode in watch view 2021-11-09 17:01:13 -05:00
Isaac Connor 7abbfc2fb5 alert error message is an error is returned instead of rows 2021-11-09 13:59:14 -05:00
Isaac Connor e617eb8615 Whitespace 2021-11-09 13:59:14 -05:00
Isaac Connor ce81099489 Report error if sql fails. Add check for access to specific event. 2021-11-09 13:59:14 -05:00
Isaac Connor 6609c154f2 Pretty up the v4l field names 2021-11-07 11:28:34 -05:00
Isaac Connor f737e3e945 Only list available ids if there are some 2021-11-06 09:58:31 -04:00
Isaac Connor 1fd99424bb Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-05 10:13:41 -04:00
Isaac Connor 3208059040 Fix event listing when not paginated. 2021-11-02 17:24:05 -04:00
Isaac Connor 0e3f694097 Rename bootstrap with version so we don't have to cache bust it, so that .map loading works. 2021-10-31 15:19:26 -04:00
Isaac Connor 97164fd4d7 Fix use of thisUrl instead of monitorUrl when getting stream status. Fix changing stream image due to use of jquery. 2021-10-31 14:44:36 -04:00
Isaac Connor 224b34d69d Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id 2021-10-29 18:54:23 -04:00
Isaac Connor 1168fc52a5 spacing and check for permission to view the specific event instead of events in general 2021-10-29 18:53:23 -04:00
Isaac Connor b4314e5d46 Remove debugging 2021-10-28 15:12:24 -04:00
Isaac Connor fee69d3bc2 is no longer in existence 2021-10-28 10:46:50 -04:00
Isaac Connor 0c157904e6 add js to manage the generate video button 2021-10-28 10:46:50 -04:00
Isaac Connor 2a160f045d Put back generate video button 2021-10-28 10:46:50 -04:00
Isaac Connor 5955e4b410 add licensing info for fontawesome. 2021-10-28 10:46:50 -04:00